diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h index 56055a9dc..da1eb39d5 100644 --- a/src/hardware/hw_drv.h +++ b/src/hardware/hw_drv.h @@ -28,6 +28,7 @@ // ========================================================================== EXPORT boolean HWRAPI(Init) (void); +EXPORT void HWRAPI(SetupGLInfo) (void); #if defined (PURESDL) || defined (macintosh) EXPORT void HWRAPI(SetPalette) (INT32 *, RGBA_t *gamma); #else @@ -95,6 +96,7 @@ EXPORT void HWRAPI(ClearLightTableCache) (void); struct hwdriver_s { Init pfnInit; + SetupGLInfo pfnSetupGLInfo; SetPalette pfnSetPalette; FinishUpdate pfnFinishUpdate; Draw2DLine pfnDraw2DLine; @@ -146,4 +148,4 @@ extern struct hwdriver_s hwdriver; #endif //not defined _CREATE_DLL_ -#endif //__HWR_DRV_H__ \ No newline at end of file +#endif //__HWR_DRV_H__ diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 3e3e23375..6da219df8 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -6599,6 +6599,8 @@ void HWR_Startup(void) CONS_Printf("HWR_Startup()...\n"); HWR_InitTextureCache(); HWR_InitMD2(); + + HWD.pfnSetupGLInfo(); } if (rendermode == render_opengl) diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index f3a6e1220..e3783b4bf 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -166,6 +166,8 @@ static const GLfloat byte2float[256] = { 0.972549f, 0.976471f, 0.980392f, 0.984314f, 0.988235f, 0.992157f, 0.996078f, 1.000000f }; +// Loaded OpenGL version +static int majorGL = 0, minorGL = 0; // -----------------+ // GL_DBG_Printf : Output debug messages to debug log if DEBUG_TO_FILE is defined, @@ -1589,6 +1591,17 @@ EXPORT boolean HWRAPI(Init) (void) } +// -----------------+ +// SetupGLInfo : Retreive and store currently loaded OpenGL version +// -----------------+ +EXPORT void HWRAPI(SetupGLInfo) (void) +{ + const GLubyte *versionGL = pglGetString(GL_VERSION); + CONS_Printf("Loaded OpenGL version %s\n", (const char*)versionGL); + sscanf((const char*)versionGL, "%d.%d", &majorGL, &minorGL); +} + + // -----------------+ // ClearMipMapCache : Flush OpenGL textures from memory // -----------------+ @@ -1970,9 +1983,6 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo) INT32 w, h; GLuint texnum = 0; - const GLubyte *versionGL = pglGetString(GL_VERSION); - int majorGL, minorGL; - sscanf(versionGL, "%d.%d", &majorGL, &minorGL); if (!pTexInfo->downloaded) { @@ -3244,10 +3254,6 @@ EXPORT void HWRAPI(RenderSkyDome) (INT32 tex, INT32 texture_width, INT32 texture // ========================================================================== EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value) { - const GLubyte *versionGL = pglGetString(GL_VERSION); - int majorGL, minorGL; - sscanf(versionGL, "%d.%d", &majorGL, &minorGL); - switch (IdState) { case HWD_SET_SHADERS: diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c index 81cf4f29f..a64a11135 100644 --- a/src/sdl/hwsym_sdl.c +++ b/src/sdl/hwsym_sdl.c @@ -78,6 +78,7 @@ void *hwSym(const char *funcName,void *handle) funcPointer = &OglSdlSetPalette; GETFUNC(Init); + GETFUNC(SetupGLInfo); GETFUNC(Draw2DLine); GETFUNC(DrawPolygon); GETFUNC(SetBlend); diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 06bece476..2eb843f60 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -2109,6 +2109,7 @@ void I_StartupGraphics(void) if (rendermode == render_opengl) { HWD.pfnInit = hwSym("Init",NULL); + HWD.pfnSetupGLInfo = hwSym("SetupGLInfo",NULL); HWD.pfnFinishUpdate = NULL; HWD.pfnDraw2DLine = hwSym("Draw2DLine",NULL); HWD.pfnDrawPolygon = hwSym("DrawPolygon",NULL);