Load glEGLImageTargetTexture2DOES at runtime

GL_OES_EGL_image is GLES-only so glad doesn't provide glEGLImageTargetTexture2DOES for desktop GL. Load the symbol at runtime via eglGetProcAddress, store it in a static internal pointer and expose an accessor (egl_image_target_texture_2d()) instead of a public global. Update call sites to use the accessor and change the typedef to use void* for GLeglImageOES per the Khronos spec. Improve the warning text when the symbol is missing and remove an unnecessary vector reserve from surface_descriptor_to_egl_attribs as a small cleanup.

Author: ReenigneArcher

src/platform/linux/graphics.cpp

@@ -31,7 +31,12 @@ using namespace std::literals;
 
 namespace gl {
   GladGLContext ctx;
-  PFNGLEGLIMAGETARGETTEXTURE2DOESPROC EGLImageTargetTexture2DOES = nullptr;
+
+  static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC egl_image_target_texture_2d_fn = nullptr;
+
+  PFNGLEGLIMAGETARGETTEXTURE2DOESPROC egl_image_target_texture_2d() {
+    return egl_image_target_texture_2d_fn;
+  }
 
   void drain_errors(const std::string_view &prefix) {
     GLenum err;
@@ -414,12 +419,10 @@ namespace egl {
       return std::nullopt;
     }
 
-    // GL_OES_EGL_image is GLES-only so glad cannot generate it for desktop GL.
-    // Load the function pointer manually at runtime.
-    gl::EGLImageTargetTexture2DOES =
-      (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) eglGetProcAddress("glEGLImageTargetTexture2DOES");
-    if (!gl::EGLImageTargetTexture2DOES) {
-      BOOST_LOG(warning) << "GL: glEGLImageTargetTexture2DOES not available"sv;
+    gl::egl_image_target_texture_2d_fn =
+      (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLADapiproc) eglGetProcAddress("glEGLImageTargetTexture2DOES");
+    if (!gl::egl_image_target_texture_2d_fn) {
+      BOOST_LOG(warning) << "GL: glEGLImageTargetTexture2DOES not available; DMA-BUF import will fail"sv;
     }
 
     // GetString returns const GLubyte* (unsigned char*); convert to std::string safely (avoids sonar cpp:S6996).
@@ -499,9 +502,6 @@ namespace egl {
    */
   std::vector<EGLAttrib> surface_descriptor_to_egl_attribs(const surface_descriptor_t &surface) {
     std::vector<EGLAttrib> attribs;
-    // Reserve worst-case capacity up front: 6 fixed + 4 planes * (6 base + 4 modifier) attrs + 1 EGL_NONE.
-    // This avoids reallocation, which works around a GCC 13 false-positive -Warray-bounds with long int vectors.
-    attribs.reserve(6 + 4 * 10 + 1);
 
     attribs.emplace_back(EGL_WIDTH);
     attribs.emplace_back(surface.width);
@@ -553,7 +553,7 @@ namespace egl {
     }
 
     gl::ctx.BindTexture(GL_TEXTURE_2D, rgb->tex[0]);
-    gl::EGLImageTargetTexture2DOES(GL_TEXTURE_2D, rgb->xrgb8);
+    gl::egl_image_target_texture_2d()(GL_TEXTURE_2D, rgb->xrgb8);
 
     gl::ctx.BindTexture(GL_TEXTURE_2D, 0);
 
@@ -611,10 +611,10 @@ namespace egl {
     }
 
     gl::ctx.BindTexture(GL_TEXTURE_2D, nv12->tex[0]);
-    gl::EGLImageTargetTexture2DOES(GL_TEXTURE_2D, nv12->r8);
+    gl::egl_image_target_texture_2d()(GL_TEXTURE_2D, nv12->r8);
 
     gl::ctx.BindTexture(GL_TEXTURE_2D, nv12->tex[1]);
-    gl::EGLImageTargetTexture2DOES(GL_TEXTURE_2D, nv12->bg88);
+    gl::egl_image_target_texture_2d()(GL_TEXTURE_2D, nv12->bg88);
 
     nv12->buf.bind(std::begin(nv12->tex), std::end(nv12->tex));
 

src/platform/linux/graphics.h

@@ -19,11 +19,6 @@
 #include "src/utility.h"
 #include "src/video_colorspace.h"
 
-// GL_OES_EGL_image is a GLES-only extension that glad cannot generate for desktop GL.
-// We load glEGLImageTargetTexture2DOES manually at runtime via eglGetProcAddress.
-// EGLImage (from glad/egl.h) and GLeglImageOES are both void* — the same underlying type.
-using PFNGLEGLIMAGETARGETTEXTURE2DOESPROC = void(GLAD_API_PTR *)(GLenum target, EGLImage image);
-
 #define SUNSHINE_STRINGIFY_HELPER(x) #x
 #define SUNSHINE_STRINGIFY(x) SUNSHINE_STRINGIFY_HELPER(x)
 #define gl_drain_errors_helper(x) gl::drain_errors(x)
@@ -41,7 +36,13 @@ using frame_t = util::safe_ptr<AVFrame, free_frame>;
 
 namespace gl {
   extern GladGLContext ctx;
-  extern PFNGLEGLIMAGETARGETTEXTURE2DOESPROC EGLImageTargetTexture2DOES;
+
+  // glEGLImageTargetTexture2DOES (GL_OES_EGL_image) is not part of desktop GL —
+  // it is a GLES extension that must be loaded manually via eglGetProcAddress.
+  // GLeglImageOES is typedef void* per the Khronos spec (gl.xml).
+  using PFNGLEGLIMAGETARGETTEXTURE2DOESPROC = void (*)(GLenum target, void *image);
+  PFNGLEGLIMAGETARGETTEXTURE2DOESPROC egl_image_target_texture_2d();
+
   void drain_errors(const std::string_view &prefix);
 
   class tex_t: public util::buffer_t<GLuint> {