Win32 fixups.

Makefile.win

@@ -114,7 +114,7 @@ ifeq ($(HAVE_THREADS), 1)
 endif
 
 ifeq ($(HAVE_OPENGL), 1)
-   OBJ += gfx/gl.o gfx/math/matrix.o gfx/fonts/gl_font.o gfx/fonts/gl_raster_font.o gfx/gfx_context.o gfx/context/wgl_ctx.o gfx/shader_glsl.o gfx/glsym/rglgen.o gfx/glsym/glsym.o
+   OBJ += gfx/gl.o gfx/math/matrix.o gfx/fonts/gl_font.o gfx/fonts/gl_raster_font.o gfx/gfx_context.o gfx/context/wgl_ctx.o gfx/shader_glsl.o gfx/glsym/rglgen.o gfx/glsym/glsym_gl.o
    DEFINES += -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_GLSL -DHAVE_GL_SYNC
    LIBS += -lopengl32 -lgdi32 -lcomdlg32
 endif

gfx/gl.c

@@ -1617,13 +1617,6 @@ static void gl_set_nonblock_state(void *data, bool state)
 
 static bool resolve_extensions(gl_t *gl)
 {
-#ifdef _WIN32
-   // Win32 GL lib doesn't have some elementary functions needed.
-   // Need to load dynamically :(
-   if (!load_gl_proc_win32(gl))
-      return false;
-#endif
-
 #ifndef HAVE_OPENGLES
    gl->core_context = g_extern.system.hw_render_callback.context_type == RETRO_HW_CONTEXT_OPENGL_CORE;
    RARCH_LOG("[GL]: Using Core GL context.\n");
@@ -1840,8 +1833,6 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
       return NULL;
    }
 
-   rglgen_resolve_symbols(gl->ctx_driver->get_proc_address);
-
    RARCH_LOG("Found GL context: %s\n", gl->ctx_driver->ident);
 
    context_get_video_size_func(&gl->full_x, &gl->full_y);
@@ -1867,6 +1858,7 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
    const char *renderer = (const char*)glGetString(GL_RENDERER);
    RARCH_LOG("[GL]: Vendor: %s, Renderer: %s.\n", vendor, renderer);
 
+   rglgen_resolve_symbols(gl->ctx_driver->get_proc_address);
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
    if (!resolve_extensions(gl))

gfx/glsym/glsym_gl.c

@@ -787,7 +787,6 @@ const struct rglgen_sym_map rglgen_symbol_map_rarch[] = {
     SYM(CreateSyncFromCLeventARB),
     SYM(DebugMessageControlARB),
     SYM(DebugMessageInsertARB),
-    SYM(DebugMessageCallbackARB),
     SYM(GetDebugMessageLogARB),
     SYM(GetGraphicsResetStatusARB),
     SYM(GetnMapdvARB),
@@ -823,7 +822,6 @@ const struct rglgen_sym_map rglgen_symbol_map_rarch[] = {
     SYM(TexStorage3D),
     SYM(DebugMessageControl),
     SYM(DebugMessageInsert),
-    SYM(DebugMessageCallback),
     SYM(GetDebugMessageLog),
     SYM(PushDebugGroup),
     SYM(PopDebugGroup),
@@ -1653,7 +1651,6 @@ RGLSYMGLGETDOUBLEI_VPROC __rglgen_glGetDoublei_v;
 RGLSYMGLCREATESYNCFROMCLEVENTARBPROC __rglgen_glCreateSyncFromCLeventARB;
 RGLSYMGLDEBUGMESSAGECONTROLARBPROC __rglgen_glDebugMessageControlARB;
 RGLSYMGLDEBUGMESSAGEINSERTARBPROC __rglgen_glDebugMessageInsertARB;
-RGLSYMGLDEBUGMESSAGECALLBACKARBPROC __rglgen_glDebugMessageCallbackARB;
 RGLSYMGLGETDEBUGMESSAGELOGARBPROC __rglgen_glGetDebugMessageLogARB;
 RGLSYMGLGETGRAPHICSRESETSTATUSARBPROC __rglgen_glGetGraphicsResetStatusARB;
 RGLSYMGLGETNMAPDVARBPROC __rglgen_glGetnMapdvARB;
@@ -1689,7 +1686,6 @@ RGLSYMGLTEXSTORAGE2DPROC __rglgen_glTexStorage2D;
 RGLSYMGLTEXSTORAGE3DPROC __rglgen_glTexStorage3D;
 RGLSYMGLDEBUGMESSAGECONTROLPROC __rglgen_glDebugMessageControl;
 RGLSYMGLDEBUGMESSAGEINSERTPROC __rglgen_glDebugMessageInsert;
-RGLSYMGLDEBUGMESSAGECALLBACKPROC __rglgen_glDebugMessageCallback;
 RGLSYMGLGETDEBUGMESSAGELOGPROC __rglgen_glGetDebugMessageLog;
 RGLSYMGLPUSHDEBUGGROUPPROC __rglgen_glPushDebugGroup;
 RGLSYMGLPOPDEBUGGROUPPROC __rglgen_glPopDebugGroup;

gfx/glsym/glsym_gl.h

@@ -780,7 +780,6 @@ typedef void (APIENTRYP RGLSYMGLGETDOUBLEI_VPROC) (GLenum target, GLuint index,
 typedef GLsync (APIENTRYP RGLSYMGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context * context, struct _cl_event * event, GLbitfield flags);
 typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam);
 typedef GLuint (APIENTRYP RGLSYMGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
 typedef GLenum (APIENTRYP RGLSYMGLGETGRAPHICSRESETSTATUSARBPROC) (void);
 typedef void (APIENTRYP RGLSYMGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
@@ -816,7 +815,6 @@ typedef void (APIENTRYP RGLSYMGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels
 typedef void (APIENTRYP RGLSYMGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
 typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (APIENTRYP RGLSYMGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
 typedef GLuint (APIENTRYP RGLSYMGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
 typedef void (APIENTRYP RGLSYMGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
 typedef void (APIENTRYP RGLSYMGLPOPDEBUGGROUPPROC) (void);
@@ -2508,7 +2506,6 @@ extern RGLSYMGLGETDOUBLEI_VPROC __rglgen_glGetDoublei_v;
 extern RGLSYMGLCREATESYNCFROMCLEVENTARBPROC __rglgen_glCreateSyncFromCLeventARB;
 extern RGLSYMGLDEBUGMESSAGECONTROLARBPROC __rglgen_glDebugMessageControlARB;
 extern RGLSYMGLDEBUGMESSAGEINSERTARBPROC __rglgen_glDebugMessageInsertARB;
-extern RGLSYMGLDEBUGMESSAGECALLBACKARBPROC __rglgen_glDebugMessageCallbackARB;
 extern RGLSYMGLGETDEBUGMESSAGELOGARBPROC __rglgen_glGetDebugMessageLogARB;
 extern RGLSYMGLGETGRAPHICSRESETSTATUSARBPROC __rglgen_glGetGraphicsResetStatusARB;
 extern RGLSYMGLGETNMAPDVARBPROC __rglgen_glGetnMapdvARB;
@@ -2544,7 +2541,6 @@ extern RGLSYMGLTEXSTORAGE2DPROC __rglgen_glTexStorage2D;
 extern RGLSYMGLTEXSTORAGE3DPROC __rglgen_glTexStorage3D;
 extern RGLSYMGLDEBUGMESSAGECONTROLPROC __rglgen_glDebugMessageControl;
 extern RGLSYMGLDEBUGMESSAGEINSERTPROC __rglgen_glDebugMessageInsert;
-extern RGLSYMGLDEBUGMESSAGECALLBACKPROC __rglgen_glDebugMessageCallback;
 extern RGLSYMGLGETDEBUGMESSAGELOGPROC __rglgen_glGetDebugMessageLog;
 extern RGLSYMGLPUSHDEBUGGROUPPROC __rglgen_glPushDebugGroup;
 extern RGLSYMGLPOPDEBUGGROUPPROC __rglgen_glPopDebugGroup;