actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scope GLExt stuff explicitly

Browse Source
This commit is contained in:
Glenn Maynard
2003-02-14 23:29:30 +00:00
parent 22bdc18d48
commit f4a14f801e
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageBitmapTexture.cpp
+2 -2
View File
@@ -344,10 +344,10 @@ retry:
}
/* Set the palette. */
glColorTableEXT(GL_TEXTURE_2D, GL_RGBA8, 256, GL_RGBA, GL_UNSIGNED_BYTE, palette);
GLExt::glColorTableEXT(GL_TEXTURE_2D, GL_RGBA8, 256, GL_RGBA, GL_UNSIGNED_BYTE, palette);
int RealFormat = 0;
glGetColorTableParameterivEXT(GL_TEXTURE_2D, GL_COLOR_TABLE_FORMAT_EXT, &RealFormat);
GLExt::glGetColorTableParameterivEXT(GL_TEXTURE_2D, GL_COLOR_TABLE_FORMAT_EXT, &RealFormat);
if(RealFormat != GL_RGBA8)
{
/* This is a case I don't expect to happen; if it does, log,
stepmania/src/RageDisplay.cpp
+6 -6
View File
@@ -168,14 +168,14 @@ void RageDisplay::SetupExtensions()
m_oglspecs->EXT_paletted_texture = HasExtension("GL_EXT_paletted_texture");
/* Find extension functions. */
wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) SDL_GL_GetProcAddress("wglSwapIntervalEXT");
glColorTableEXT = (PFNGLCOLORTABLEPROC) SDL_GL_GetProcAddress("glColorTableEXT");
glGetColorTableParameterivEXT = (PFNGLCOLORTABLEPARAMETERIVPROC) SDL_GL_GetProcAddress("glGetColorTableParameterivEXT");
GLExt::wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) SDL_GL_GetProcAddress("wglSwapIntervalEXT");
GLExt::glColorTableEXT = (PFNGLCOLORTABLEPROC) SDL_GL_GetProcAddress("glColorTableEXT");
GLExt::glGetColorTableParameterivEXT = (PFNGLCOLORTABLEPARAMETERIVPROC) SDL_GL_GetProcAddress("glGetColorTableParameterivEXT");
/* Make sure we have all components for detected extensions. */
if(m_oglspecs->WGL_EXT_swap_control)
{
if(!wglSwapIntervalEXT)
if(!GLExt::wglSwapIntervalEXT)
{
LOG->Warn("wglSwapIntervalEXT but wglSwapIntervalEXT() not found");
m_oglspecs->WGL_EXT_swap_control=false;
@@ -183,7 +183,7 @@ void RageDisplay::SetupExtensions()
}
if(m_oglspecs->EXT_paletted_texture)
{
if(!glColorTableEXT || !glGetColorTableParameterivEXT)
if(!GLExt::glColorTableEXT || !GLExt::glGetColorTableParameterivEXT)
{
LOG->Warn("GL_EXT_paletted_texture but glColorTableEXT or glGetColorTableParameterivEXT not found");
m_oglspecs->EXT_paletted_texture = false;
@@ -271,7 +271,7 @@ bool RageDisplay::SetVideoMode( bool windowed, int width, int height, int bpp, i
/* Set vsync the Windows way, if we can. (What other extensions are there
* to do this, for other archs?) */
if(m_oglspecs->WGL_EXT_swap_control) {
wglSwapIntervalEXT(vsync);
GLExt::wglSwapIntervalEXT(vsync);
}
g_CurrentWidth = g_screen->w;
stepmania/src/RageDisplayInternal.h
-1
View File
@@ -53,7 +53,6 @@ namespace GLExt {
extern PFNGLCOLORTABLEPROC glColorTableEXT;
extern PFNGLCOLORTABLEPARAMETERIVPROC glGetColorTableParameterivEXT;
};
using namespace GLExt;
#endif