[RFC,v1,04/10] libcamera: egl: Ensure all members are always initialized
diff mbox series

Message ID 20260804101949.353266-5-barnabas.pocze@ideasonboard.com
State New
Headers show
Series
  • libcamera: software_isp: debayer_egl: Remove some leaks
Related show

Commit Message

Barnabás Pőcze Aug. 4, 2026, 10:19 a.m. UTC 
The `tid_` and function pointer members were not previously
initialize before calling `initEGLContext()`, fix that.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 include/libcamera/internal/egl.h | 10 ++++++----
 src/libcamera/egl.cpp            | 24 +++++++++++++-----------
 2 files changed, 19 insertions(+), 15 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/internal/egl.h b/include/libcamera/internal/egl.h
index 6abb02bf3b..fb77225ac4 100644
--- a/include/libcamera/internal/egl.h
+++ b/include/libcamera/internal/egl.h
@@ -129,7 +129,7 @@  public:
 private:
 	LIBCAMERA_DISABLE_COPY_AND_MOVE(eGL)
 
-	pid_t tid_;
+	pid_t tid_ = -1;
 
 	EGLDisplay display_ = EGL_NO_DISPLAY;
 	EGLContext context_ = EGL_NO_CONTEXT;
@@ -139,8 +139,10 @@  private:
 
 	int createDMABufTexture2D(eGLImage &eglImage, int fd, bool output);
 
-	PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
-	PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
-	PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
+	struct VTable {
+		PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES;
+		PFNEGLCREATEIMAGEKHRPROC eglCreateImageKHR;
+		PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR;
+	} vtable_ = {};
 };
 } //namespace libcamera
diff --git a/src/libcamera/egl.cpp b/src/libcamera/egl.cpp
index 0768a840e6..3de5fab816 100644
--- a/src/libcamera/egl.cpp
+++ b/src/libcamera/egl.cpp
@@ -199,9 +199,9 @@  int eGL::createDMABufTexture2D(eGLImage &eglImage, int fd, bool output)
 	};
 	// clang-format on
 
-	EGLImageKHR image = eglCreateImageKHR(display_, EGL_NO_CONTEXT,
-					      EGL_LINUX_DMA_BUF_EXT,
-					      NULL, image_attrs);
+	EGLImageKHR image = vtable_.eglCreateImageKHR(display_, EGL_NO_CONTEXT,
+						      EGL_LINUX_DMA_BUF_EXT,
+						      NULL, image_attrs);
 
 	if (image == EGL_NO_IMAGE_KHR) {
 		LOG(eGL, Debug) << "eglCreateImageKHR fail";
@@ -212,8 +212,8 @@  int eGL::createDMABufTexture2D(eGLImage &eglImage, int fd, bool output)
 	activateBindTexture(eglImage);
 
 	// Generate texture with filter semantics
-	glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
-	eglDestroyImageKHR(display_, image);
+	vtable_.glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
+	vtable_.eglDestroyImageKHR(display_, image);
 
 	// Nearest filtering
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -379,6 +379,7 @@  int eGL::initEGLContext()
 		EGL_NONE
 	};
 
+	VTable vtable = {};
 	EGLint numConfigs;
 	EGLConfig config;
 
@@ -392,20 +393,20 @@  int eGL::initEGLContext()
 	LOG(eGL, Info) << "EGL: EGL_CLIENT_APIS: " << eglQueryString(display_, EGL_CLIENT_APIS);
 	LOG(eGL, Info) << "EGL: EGL_EXTENSIONS: " << eglQueryString(display_, EGL_EXTENSIONS);
 
-	eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC)eglGetProcAddress("eglCreateImageKHR");
-	if (!eglCreateImageKHR) {
+	vtable.eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC)eglGetProcAddress("eglCreateImageKHR");
+	if (!vtable.eglCreateImageKHR) {
 		LOG(eGL, Error) << "eglCreateImageKHR not found";
 		goto fail;
 	}
 
-	eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC)eglGetProcAddress("eglDestroyImageKHR");
-	if (!eglDestroyImageKHR) {
+	vtable.eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC)eglGetProcAddress("eglDestroyImageKHR");
+	if (!vtable.eglDestroyImageKHR) {
 		LOG(eGL, Error) << "eglDestroyImageKHR not found";
 		goto fail;
 	}
 
-	glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)eglGetProcAddress("glEGLImageTargetTexture2DOES");
-	if (!glEGLImageTargetTexture2DOES) {
+	vtable.glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)eglGetProcAddress("glEGLImageTargetTexture2DOES");
+	if (!vtable.glEGLImageTargetTexture2DOES) {
 		LOG(eGL, Error) << "glEGLImageTargetTexture2DOES not found";
 		goto fail;
 	}
@@ -422,6 +423,7 @@  int eGL::initEGLContext()
 	}
 
 	tid_ = Thread::currentId();
+	vtable_ = vtable;
 
 	makeCurrent();