stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 07:12:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse source
This commit is contained in:
Alam Ed Arias 2014-11-02 01:12:23 -05:00
commit 3fe4921a24
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/hardware/r_opengl/ogl_win.c
View file

@ -366,10 +366,7 @@ static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode)
else else
maximumAnisotropy = 0; maximumAnisotropy = 0;
#ifndef MINI_GL_COMPATIBILITY
SetupGLFunc13(); SetupGLFunc13();
#endif
screen_depth = (GLbyte)(lvid->bpp*8); screen_depth = (GLbyte)(lvid->bpp*8);
if (screen_depth > 16) if (screen_depth > 16)

24
src/hardware/r_opengl/r_opengl.c
View file

@ -517,18 +517,15 @@ boolean SetupGLfunc(void)
return true; return true;
} }
#ifndef MINI_GL_COMPATIBILITY
// This has to be done after the context is created so the version number can be obtained // This has to be done after the context is created so the version number can be obtained
boolean SetupGLFunc13(void) boolean SetupGLFunc13(void)
{ {
#ifndef STATIC_OPENGL #ifdef MINI_GL_COMPATIBILITY
#define GETOPENGLFUNC(func, proc) \ return false;
func = GetGLFunc(#proc); \ #else
if (!func) \ #ifdef STATIC_OPENGL
{ \ gl13 = true;
DBG_Printf("failed to get OpenGL function: %s", #proc); \ #else
} \
const char *glversion = (const char *)pglGetString(GL_VERSION); const char *glversion = (const char *)pglGetString(GL_VERSION);
UINT32 majorversion = 0, minorversion = 0; UINT32 majorversion = 0, minorversion = 0;
@ -537,18 +534,19 @@ boolean SetupGLFunc13(void)
if (majorversion > 1 || (majorversion == 1 && minorversion >= 3)) // Version of OpenGL is equal to or greater than 1.3 if (majorversion > 1 || (majorversion == 1 && minorversion >= 3)) // Version of OpenGL is equal to or greater than 1.3
{ {
// Get the functions // Get the functions
GETOPENGLFUNC(pglActiveTexture , glActiveTexture) pglActiveTexture = GetGLFunc("glActiveTexture");
GETOPENGLFUNC(pglMultiTexCoord2f , glMultiTexCoord2f) pglMultiTexCoord2f = GetGLFunc("glMultiTexCoord2f");
gl13 = true; // This is now true, so the new fade mask stuff can be done, if OpenGL version is less than 1.3, it still uses the old fade stuff. if (pglMultiTexCoord2f)
gl13 = true; // This is now true, so the new fade mask stuff can be done, if OpenGL version is less than 1.3, it still uses the old fade stuff.
} }
} }
#undef GETOPENGLFUNC #undef GETOPENGLFUNC
#endif #endif
return true; return true;
}
#endif #endif
}
// -----------------+ // -----------------+
// SetNoTexture : Disable texture // SetNoTexture : Disable texture

2
src/sdl/ogl_sdl.c
View file

@ -176,6 +176,8 @@ boolean OglSdlSurface(INT32 w, INT32 h)
else else
maximumAnisotropy = 1; maximumAnisotropy = 1;
SetupGLFunc13();
granisotropicmode_cons_t[1].value = maximumAnisotropy; granisotropicmode_cons_t[1].value = maximumAnisotropy;
SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0); SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0);

2
src/sdl12/ogl_sdl.c
View file

@ -237,6 +237,8 @@ boolean OglSdlSurface(INT32 w, INT32 h, boolean isFullscreen)
#endif #endif
maximumAnisotropy = 0; maximumAnisotropy = 0;
SetupGLFunc13();
granisotropicmode_cons_t[1].value = maximumAnisotropy; granisotropicmode_cons_t[1].value = maximumAnisotropy;
SetModelView(w, h); SetModelView(w, h);