drivers/glrend: switch to the userptr variant of GetProcAddress

Author: vs49688

drivers/glrend/devpmglf.c

@@ -230,7 +230,7 @@ br_device_pixelmap *DevicePixelmapGLAllocateFront(br_device *dev, br_output_faci
     if(DevicePixelmapGLExtMakeCurrent(self, self->asFront.gl_context) != BRE_OK)
         goto cleanup_context;
 
-    if((glad_version = gladLoadGLContext(&self->asFront.glad_gl_context, DevicePixelmapGLExtGetGetProcAddress(self))) == 0) {
+    if((glad_version = gladLoadGLContextUserPtr(&self->asFront.glad_gl_context, DevicePixelmapGLExtGetGetProcAddress(self), self)) == 0) {
         BrLogError("GLREND", "Unable to load OpenGL functions.");
         goto cleanup_context;
     }

drivers/glrend/drv_ip.h

@@ -205,7 +205,7 @@ br_error DevicePixelmapGLExtMakeCurrent(br_device_pixelmap *self, void *ctx);
 
 void DevicePixelmapGLExtSwapBuffers(br_device_pixelmap *self);
 
-br_device_pixelmap_gl_getprocaddress_cbfn *DevicePixelmapGLExtGetGetProcAddress(br_device_pixelmap *self);
+GLADuserptrloadfunc DevicePixelmapGLExtGetGetProcAddress(br_device_pixelmap *self);
 
 br_error DevicePixelmapGLExtResize(br_device_pixelmap *self, br_int_32 w, br_int_32 h);
 

drivers/glrend/ext_procs.c

@@ -34,10 +34,17 @@ br_error DevicePixelmapGLExtResize(br_device_pixelmap *self, br_int_32 w, br_int
     return self->asFront.ext_procs.resize((br_pixelmap *)self, w, h, self->asFront.ext_procs.user);
 }
 
-br_device_pixelmap_gl_getprocaddress_cbfn *DevicePixelmapGLExtGetGetProcAddress(br_device_pixelmap *self)
+static GLADapiproc GetProcAddressInternal(void *userptr, const char *name)
 {
+    br_device_pixelmap *self = userptr;
     UASSERT(self->use_type == BRT_NONE);
-    return self->asFront.ext_procs.get_proc_address;
+    return self->asFront.ext_procs.get_proc_address(name, self->asFront.ext_procs.user);
+}
+
+GLADuserptrloadfunc DevicePixelmapGLExtGetGetProcAddress(br_device_pixelmap *self)
+{
+    (void)self;
+    return GetProcAddressInternal;
 }
 
 void DevicePixelmapGLExtPreSwap(br_device_pixelmap *self, GLuint fbo)

drivers/glrend/include/brglrend.h

@@ -36,7 +36,7 @@ typedef void BR_CALLBACK br_device_pixelmap_gl_swapbuffers_cbfn(br_pixelmap *pm,
 
 typedef br_error BR_CALLBACK br_device_pixelmap_gl_resize_cbfn(br_pixelmap *pm, br_int_32 w, br_int_32 h, void *user);
 
-typedef void (*BR_CALLBACK br_device_pixelmap_gl_getprocaddress_cbfn(const char *name))(void);
+typedef void (*BR_CALLBACK br_device_pixelmap_gl_getprocaddress_cbfn(const char *name, void *user))(void);
 
 typedef void BR_CALLBACK br_device_pixelmap_gl_preswap_hook_cbfn(br_pixelmap *pm, unsigned int fbo, void *user);
 

drivers/sdl2dev/glrend.c

@@ -67,8 +67,9 @@ static br_error sdl_gl_make_current(br_pixelmap *dev, void *ctx, void *user)
     return BRE_OK;
 }
 
-static void (*sdl_gl_get_proc_address(const char *name))(void)
+static void (*sdl_gl_get_proc_address(const char *name, void *user))(void)
 {
+    (void)user;
     return SDL_GL_GetProcAddress(name);
 }
 

drivers/sdl3dev/glrend.c

@@ -68,8 +68,9 @@ static br_error sdl_gl_make_current(br_pixelmap *dev, void *ctx, void *user)
     return BRE_OK;
 }
 
-static void (*sdl_gl_get_proc_address(const char *name))(void)
+static void (*sdl_gl_get_proc_address(const char *name, void *user))(void)
 {
+    (void)user;
     return SDL_GL_GetProcAddress(name);
 }