| Message ID | 20260110170927.79918-2-robert.mader@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hi, On 10-Jan-26 18:09, Robert Mader wrote: > They are left-overs from older iterations of the GPU-ISP. > > Signed-off-by: Robert Mader <robert.mader@collabora.com> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <johannes.goede@oss.qualcomm.com> Regards, Hans > --- > include/libcamera/internal/egl.h | 10 ---------- > src/libcamera/egl.cpp | 10 ---------- > src/libcamera/software_isp/debayer_egl.cpp | 2 -- > 3 files changed, 22 deletions(-) > > diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h > index a92921123..7b810773c 100644 > --- a/include/libcamera/internal/egl.h > +++ b/include/libcamera/internal/egl.h > @@ -64,15 +64,6 @@ public: > glGenFramebuffers(1, &fbo_); > } > > - /** > - * \brief Construct an eGLImage with automatic stride calculation > - */ > - eGLImage(uint32_t width, uint32_t height, uint32_t bpp, GLenum texture_unit, uint32_t texture_unit_uniform_id) > - : eGLImage(width, height, bpp, utils::alignUp(width * bpp / 8, 256), > - texture_unit, texture_unit_uniform_id) > - { > - } > - > /** > * \brief Destroy the eGLImage > * > @@ -108,7 +99,6 @@ public: > ~eGL(); > > int initEGLContext(GBM *gbmContext); > - void cleanUp(); > > int createInputDMABufTexture2D(eGLImage &eglImage, int fd); > int createOutputDMABufTexture2D(eGLImage &eglImage, int fd); > diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp > index 0544056bd..fcaf7c58f 100644 > --- a/src/libcamera/egl.cpp > + ++ b/src/libcamera/egl.cpp > @@ -349,16 +349,6 @@ fail: > return -ENODEV; > } > > -/** > - * \brief Clean up EGL resources > - * > - * Destroys the EGL sync object. Must be called from the same thread > - * that created the EGL context. > - */ > -void eGL::cleanUp() > -{ > -} > - > /** > * \brief Make the EGL context current for the calling thread > * > diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp > index 8e0890323..1c13b72a5 100644 > --- a/src/libcamera/software_isp/debayer_egl.cpp > +++ b/src/libcamera/software_isp/debayer_egl.cpp > @@ -615,8 +615,6 @@ void DebayerEGL::stop() > > if (programId_) > glDeleteProgram(programId_); > - > - egl_.cleanUp(); > } > > SizeRange DebayerEGL::sizes(PixelFormat inputFormat, const Size &inputSize)
diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h index a92921123..7b810773c 100644 --- a/include/libcamera/internal/egl.h +++ b/include/libcamera/internal/egl.h @@ -64,15 +64,6 @@ public: glGenFramebuffers(1, &fbo_); } - /** - * \brief Construct an eGLImage with automatic stride calculation - */ - eGLImage(uint32_t width, uint32_t height, uint32_t bpp, GLenum texture_unit, uint32_t texture_unit_uniform_id) - : eGLImage(width, height, bpp, utils::alignUp(width * bpp / 8, 256), - texture_unit, texture_unit_uniform_id) - { - } - /** * \brief Destroy the eGLImage * @@ -108,7 +99,6 @@ public: ~eGL(); int initEGLContext(GBM *gbmContext); - void cleanUp(); int createInputDMABufTexture2D(eGLImage &eglImage, int fd); int createOutputDMABufTexture2D(eGLImage &eglImage, int fd); diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp index 0544056bd..fcaf7c58f 100644 --- a/src/libcamera/egl.cpp +++ b/src/libcamera/egl.cpp @@ -349,16 +349,6 @@ fail: return -ENODEV; } -/** - * \brief Clean up EGL resources - * - * Destroys the EGL sync object. Must be called from the same thread - * that created the EGL context. - */ -void eGL::cleanUp() -{ -} - /** * \brief Make the EGL context current for the calling thread * diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 8e0890323..1c13b72a5 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -615,8 +615,6 @@ void DebayerEGL::stop() if (programId_) glDeleteProgram(programId_); - - egl_.cleanUp(); } SizeRange DebayerEGL::sizes(PixelFormat inputFormat, const Size &inputSize)
They are left-overs from older iterations of the GPU-ISP. Signed-off-by: Robert Mader <robert.mader@collabora.com> --- include/libcamera/internal/egl.h | 10 ---------- src/libcamera/egl.cpp | 10 ---------- src/libcamera/software_isp/debayer_egl.cpp | 2 -- 3 files changed, 22 deletions(-)