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

make GLExt a struct, so it can be zeroed as a unit, and so extension functions

Browse Source 
don't take two lines to declare
This commit is contained in:
Glenn Maynard
2004-05-24 03:41:49 +00:00
parent 4bb777232d
commit 0c9c336dc3
1 changed files with 83 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+83 -85
View File
@@ -31,18 +31,24 @@ typedef bool (APIENTRY * PWSWAPINTERVALEXTPROC) (int interval);
/* Extension functions we use. Put these in a namespace instead of in oglspecs_t, /* Extension functions we use. Put these in a namespace instead of in oglspecs_t,
* so they can be called like regular functions. */ * so they can be called like regular functions. */
namespace GLExt { static struct
extern PWSWAPINTERVALEXTPROC wglSwapIntervalEXT; {
extern PFNGLCOLORTABLEPROC glColorTableEXT; PWSWAPINTERVALEXTPROC wglSwapIntervalEXT;
extern PFNGLCOLORTABLEPARAMETERIVPROC glGetColorTableParameterivEXT; PFNGLCOLORTABLEPROC glColorTableEXT;
extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB; PFNGLCOLORTABLEPARAMETERIVPROC glGetColorTableParameterivEXT;
extern PFNGLGENBUFFERSARBPROC glGenBuffersARB; PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
extern PFNGLBINDBUFFERARBPROC glBindBufferARB; PFNGLGENBUFFERSARBPROC glGenBuffersARB;
extern PFNGLBUFFERDATAARBPROC glBufferDataARB; PFNGLBINDBUFFERARBPROC glBindBufferARB;
extern PFNGLBUFFERSUBDATAARBPROC glBufferSubDataARB; PFNGLBUFFERDATAARBPROC glBufferDataARB;
extern PFNGLDELETEBUFFERSARBPROC glDeleteBuffersARB; PFNGLBUFFERSUBDATAARBPROC glBufferSubDataARB;
extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; PFNGLDELETEBUFFERSARBPROC glDeleteBuffersARB;
}; PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
void Reset()
{
memset( this, 0, sizeof(*this) );
}
} GLExt;
#if defined(DARWIN) #if defined(DARWIN)
#include "archutils/Darwin/Vsync.h" #include "archutils/Darwin/Vsync.h"
@@ -75,16 +81,6 @@ namespace GLExt {
// Globals // Globals
// //
PWSWAPINTERVALEXTPROC GLExt::wglSwapIntervalEXT = NULL;
PFNGLCOLORTABLEPROC GLExt::glColorTableEXT = NULL;
PFNGLCOLORTABLEPARAMETERIVPROC GLExt::glGetColorTableParameterivEXT = NULL;
PFNGLACTIVETEXTUREARBPROC GLExt::glActiveTextureARB = NULL;
PFNGLGENBUFFERSARBPROC GLExt::glGenBuffersARB = NULL;
PFNGLBINDBUFFERARBPROC GLExt::glBindBufferARB = NULL;
PFNGLBUFFERDATAARBPROC GLExt::glBufferDataARB = NULL;
PFNGLBUFFERSUBDATAARBPROC GLExt::glBufferSubDataARB = NULL;
PFNGLDELETEBUFFERSARBPROC GLExt::glDeleteBuffersARB = NULL;
PFNGLDRAWRANGEELEMENTSPROC GLExt::glDrawRangeElements = NULL;
static bool g_bEXT_texture_env_combine = true; static bool g_bEXT_texture_env_combine = true;
static bool g_bGL_EXT_bgra = true; static bool g_bGL_EXT_bgra = true;
@@ -317,10 +313,10 @@ static void FlushGLErrors()
static void TurnOffHardwareVBO() static void TurnOffHardwareVBO()
{ {
if( GLExt::glBindBufferARB ) if( GLExt.glBindBufferARB )
{ {
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 ); GLExt.glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
} }
} }
@@ -515,13 +511,13 @@ static void CheckPalettedTextures()
break; break;
} }
if( GLExt::glColorTableEXT == NULL ) if( GLExt.glColorTableEXT == NULL )
{ {
error = "glColorTableEXT missing"; error = "glColorTableEXT missing";
break; break;
} }
if( GLExt::glGetColorTableParameterivEXT == NULL ) if( GLExt.glGetColorTableParameterivEXT == NULL )
{ {
error = "glGetColorTableParameterivEXT missing"; error = "glGetColorTableParameterivEXT missing";
break; break;
@@ -563,7 +559,7 @@ static void CheckPalettedTextures()
GLubyte palette[256*4]; GLubyte palette[256*4];
memset(palette, 0, sizeof(palette)); memset(palette, 0, sizeof(palette));
GLExt::glColorTableEXT(GL_PROXY_TEXTURE_2D, GL_RGBA8, 256, GL_RGBA, GL_UNSIGNED_BYTE, palette); GLExt.glColorTableEXT(GL_PROXY_TEXTURE_2D, GL_RGBA8, 256, GL_RGBA, GL_UNSIGNED_BYTE, palette);
GL_CHECK_ERROR( "glColorTableEXT" ); GL_CHECK_ERROR( "glColorTableEXT" );
GLint size = 0; GLint size = 0;
@@ -576,7 +572,7 @@ static void CheckPalettedTextures()
} }
GLint RealWidth = 0; GLint RealWidth = 0;
GLExt::glGetColorTableParameterivEXT(GL_PROXY_TEXTURE_2D, GL_COLOR_TABLE_WIDTH, &RealWidth); GLExt.glGetColorTableParameterivEXT(GL_PROXY_TEXTURE_2D, GL_COLOR_TABLE_WIDTH, &RealWidth);
GL_CHECK_ERROR( "glGetColorTableParameterivEXT(GL_COLOR_TABLE_WIDTH)" ); GL_CHECK_ERROR( "glGetColorTableParameterivEXT(GL_COLOR_TABLE_WIDTH)" );
if( RealWidth != 1 << bits ) if( RealWidth != 1 << bits )
{ {
@@ -585,7 +581,7 @@ static void CheckPalettedTextures()
} }
GLint RealFormat = 0; GLint RealFormat = 0;
GLExt::glGetColorTableParameterivEXT(GL_PROXY_TEXTURE_2D, GL_COLOR_TABLE_FORMAT, &RealFormat); GLExt.glGetColorTableParameterivEXT(GL_PROXY_TEXTURE_2D, GL_COLOR_TABLE_FORMAT, &RealFormat);
GL_CHECK_ERROR( "glGetColorTableParameterivEXT(GL_COLOR_TABLE_FORMAT)" ); GL_CHECK_ERROR( "glGetColorTableParameterivEXT(GL_COLOR_TABLE_FORMAT)" );
if( RealFormat != GL_RGBA8 ) if( RealFormat != GL_RGBA8 )
{ {
@@ -600,8 +596,8 @@ static void CheckPalettedTextures()
/* If 8-bit palettes don't work, disable them entirely--don't trust 4-bit /* If 8-bit palettes don't work, disable them entirely--don't trust 4-bit
* palettes if it can't even get 8-bit ones right. */ * palettes if it can't even get 8-bit ones right. */
GLExt::glColorTableEXT = NULL; GLExt.glColorTableEXT = NULL;
GLExt::glGetColorTableParameterivEXT = NULL; GLExt.glGetColorTableParameterivEXT = NULL;
LOG->Info("Paletted textures disabled: %s.", error.c_str()); LOG->Info("Paletted textures disabled: %s.", error.c_str());
} }
@@ -634,21 +630,23 @@ void SetupExtensions()
const float fGLUVersion = (float) atof( (const char *) gluGetString(GLU_VERSION) ); const float fGLUVersion = (float) atof( (const char *) gluGetString(GLU_VERSION) );
g_gluVersion = int(roundf(fGLUVersion * 10)); g_gluVersion = int(roundf(fGLUVersion * 10));
/* Find extension functions and reset broken flags */ /* Find extension functions. */
GLExt.Reset();
#if !defined(DARWIN) #if !defined(DARWIN)
GLExt::wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) wind->GetProcAddress("wglSwapIntervalEXT"); GLExt.wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) wind->GetProcAddress("wglSwapIntervalEXT");
#else #else
GLExt::wglSwapIntervalEXT = wglSwapIntervalEXT; GLExt.wglSwapIntervalEXT = wglSwapIntervalEXT;
#endif #endif
GLExt::glColorTableEXT = (PFNGLCOLORTABLEPROC) wind->GetProcAddress("glColorTableEXT"); GLExt.glColorTableEXT = (PFNGLCOLORTABLEPROC) wind->GetProcAddress("glColorTableEXT");
GLExt::glGetColorTableParameterivEXT = (PFNGLCOLORTABLEPARAMETERIVPROC) wind->GetProcAddress("glGetColorTableParameterivEXT"); GLExt.glGetColorTableParameterivEXT = (PFNGLCOLORTABLEPARAMETERIVPROC) wind->GetProcAddress("glGetColorTableParameterivEXT");
GLExt::glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC) wind->GetProcAddress("glActiveTextureARB"); GLExt.glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC) wind->GetProcAddress("glActiveTextureARB");
GLExt::glGenBuffersARB = (PFNGLGENBUFFERSARBPROC) wind->GetProcAddress("glGenBuffersARB"); GLExt.glGenBuffersARB = (PFNGLGENBUFFERSARBPROC) wind->GetProcAddress("glGenBuffersARB");
GLExt::glBindBufferARB = (PFNGLBINDBUFFERARBPROC) wind->GetProcAddress("glBindBufferARB"); GLExt.glBindBufferARB = (PFNGLBINDBUFFERARBPROC) wind->GetProcAddress("glBindBufferARB");
GLExt::glBufferDataARB = (PFNGLBUFFERDATAARBPROC) wind->GetProcAddress("glBufferDataARB"); GLExt.glBufferDataARB = (PFNGLBUFFERDATAARBPROC) wind->GetProcAddress("glBufferDataARB");
GLExt::glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC) wind->GetProcAddress("glBufferSubDataARB"); GLExt.glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC) wind->GetProcAddress("glBufferSubDataARB");
GLExt::glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC) wind->GetProcAddress("glDeleteBuffersARB"); GLExt.glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC) wind->GetProcAddress("glDeleteBuffersARB");
GLExt::glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC) wind->GetProcAddress("glDrawRangeElements"); GLExt.glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC) wind->GetProcAddress("glDrawRangeElements");
g_bEXT_texture_env_combine = HasExtension("GL_EXT_texture_env_combine"); g_bEXT_texture_env_combine = HasExtension("GL_EXT_texture_env_combine");
g_bGL_EXT_bgra = HasExtension("GL_EXT_bgra"); g_bGL_EXT_bgra = HasExtension("GL_EXT_bgra");
CheckPalettedTextures(); CheckPalettedTextures();
@@ -774,8 +772,8 @@ CString RageDisplay_OGL::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
/* Set vsync the Windows way, if we can. (What other extensions are there /* Set vsync the Windows way, if we can. (What other extensions are there
* to do this, for other archs?) */ * to do this, for other archs?) */
if( GLExt::wglSwapIntervalEXT ) if( GLExt.wglSwapIntervalEXT )
GLExt::wglSwapIntervalEXT(p.vsync); GLExt.wglSwapIntervalEXT(p.vsync);
ResolutionChanged(); ResolutionChanged();
@@ -1013,13 +1011,13 @@ RageCompiledGeometryHWOGL::~RageCompiledGeometryHWOGL()
g_GeometryList.erase( this ); g_GeometryList.erase( this );
FlushGLErrors(); FlushGLErrors();
GLExt::glDeleteBuffersARB( 1, &m_nPositions ); GLExt.glDeleteBuffersARB( 1, &m_nPositions );
AssertNoGLError(); AssertNoGLError();
GLExt::glDeleteBuffersARB( 1, &m_nTextureCoords ); GLExt.glDeleteBuffersARB( 1, &m_nTextureCoords );
AssertNoGLError(); AssertNoGLError();
GLExt::glDeleteBuffersARB( 1, &m_nNormals ); GLExt.glDeleteBuffersARB( 1, &m_nNormals );
AssertNoGLError(); AssertNoGLError();
GLExt::glDeleteBuffersARB( 1, &m_nTriangles ); GLExt.glDeleteBuffersARB( 1, &m_nTriangles );
AssertNoGLError(); AssertNoGLError();
} }
@@ -1029,57 +1027,57 @@ void RageCompiledGeometryHWOGL::AllocateBuffers()
if( !m_nPositions ) if( !m_nPositions )
{ {
GLExt::glGenBuffersARB( 1, &m_nPositions ); GLExt.glGenBuffersARB( 1, &m_nPositions );
AssertNoGLError(); AssertNoGLError();
} }
if( !m_nTextureCoords ) if( !m_nTextureCoords )
{ {
GLExt::glGenBuffersARB( 1, &m_nTextureCoords ); GLExt.glGenBuffersARB( 1, &m_nTextureCoords );
AssertNoGLError(); AssertNoGLError();
} }
if( !m_nNormals ) if( !m_nNormals )
{ {
GLExt::glGenBuffersARB( 1, &m_nNormals ); GLExt.glGenBuffersARB( 1, &m_nNormals );
AssertNoGLError(); AssertNoGLError();
} }
if( !m_nTriangles ) if( !m_nTriangles )
{ {
GLExt::glGenBuffersARB( 1, &m_nTriangles ); GLExt.glGenBuffersARB( 1, &m_nTriangles );
AssertNoGLError(); AssertNoGLError();
} }
} }
void RageCompiledGeometryHWOGL::UploadData() void RageCompiledGeometryHWOGL::UploadData()
{ {
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nPositions ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nPositions );
GLExt::glBufferDataARB( GLExt.glBufferDataARB(
GL_ARRAY_BUFFER_ARB, GL_ARRAY_BUFFER_ARB,
GetTotalVertices()*sizeof(RageVector3), GetTotalVertices()*sizeof(RageVector3),
&m_vPosition[0], &m_vPosition[0],
GL_STATIC_DRAW_ARB ); GL_STATIC_DRAW_ARB );
// AssertNoGLError(); // AssertNoGLError();
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nTextureCoords ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nTextureCoords );
GLExt::glBufferDataARB( GLExt.glBufferDataARB(
GL_ARRAY_BUFFER_ARB, GL_ARRAY_BUFFER_ARB,
GetTotalVertices()*sizeof(RageVector2), GetTotalVertices()*sizeof(RageVector2),
&m_vTexture[0], &m_vTexture[0],
GL_STATIC_DRAW_ARB ); GL_STATIC_DRAW_ARB );
// AssertNoGLError(); // AssertNoGLError();
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nNormals ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nNormals );
GLExt::glBufferDataARB( GLExt.glBufferDataARB(
GL_ARRAY_BUFFER_ARB, GL_ARRAY_BUFFER_ARB,
GetTotalVertices()*sizeof(RageVector3), GetTotalVertices()*sizeof(RageVector3),
&m_vNormal[0], &m_vNormal[0],
GL_STATIC_DRAW_ARB ); GL_STATIC_DRAW_ARB );
// AssertNoGLError(); // AssertNoGLError();
GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_nTriangles ); GLExt.glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_nTriangles );
GLExt::glBufferDataARB( GLExt.glBufferDataARB(
GL_ELEMENT_ARRAY_BUFFER_ARB, GL_ELEMENT_ARRAY_BUFFER_ARB,
GetTotalTriangles()*sizeof(msTriangle), GetTotalTriangles()*sizeof(msTriangle),
&m_vTriangles[0], &m_vTriangles[0],
@@ -1099,32 +1097,32 @@ void RageCompiledGeometryHWOGL::Allocate( const vector<msMesh> &vMeshes )
{ {
RageCompiledGeometrySWOGL::Allocate( vMeshes ); RageCompiledGeometrySWOGL::Allocate( vMeshes );
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nPositions ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nPositions );
GLExt::glBufferDataARB( GLExt.glBufferDataARB(
GL_ARRAY_BUFFER_ARB, GL_ARRAY_BUFFER_ARB,
GetTotalVertices()*sizeof(RageVector3), GetTotalVertices()*sizeof(RageVector3),
NULL, NULL,
GL_STATIC_DRAW_ARB ); GL_STATIC_DRAW_ARB );
AssertNoGLError(); AssertNoGLError();
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nTextureCoords ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nTextureCoords );
GLExt::glBufferDataARB( GLExt.glBufferDataARB(
GL_ARRAY_BUFFER_ARB, GL_ARRAY_BUFFER_ARB,
GetTotalVertices()*sizeof(RageVector2), GetTotalVertices()*sizeof(RageVector2),
NULL, NULL,
GL_STATIC_DRAW_ARB ); GL_STATIC_DRAW_ARB );
AssertNoGLError(); AssertNoGLError();
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nNormals ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nNormals );
GLExt::glBufferDataARB( GLExt.glBufferDataARB(
GL_ARRAY_BUFFER_ARB, GL_ARRAY_BUFFER_ARB,
GetTotalVertices()*sizeof(RageVector3), GetTotalVertices()*sizeof(RageVector3),
NULL, NULL,
GL_STATIC_DRAW_ARB ); GL_STATIC_DRAW_ARB );
AssertNoGLError(); AssertNoGLError();
GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_nTriangles ); GLExt.glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_nTriangles );
GLExt::glBufferDataARB( GLExt.glBufferDataARB(
GL_ELEMENT_ARRAY_BUFFER_ARB, GL_ELEMENT_ARRAY_BUFFER_ARB,
GetTotalTriangles()*sizeof(msTriangle), GetTotalTriangles()*sizeof(msTriangle),
NULL, NULL,
@@ -1148,7 +1146,7 @@ void RageCompiledGeometryHWOGL::Draw( int iMeshIndex ) const
return; return;
glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_VERTEX_ARRAY);
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nPositions ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nPositions );
AssertNoGLError(); AssertNoGLError();
glVertexPointer(3, GL_FLOAT, 0, NULL ); glVertexPointer(3, GL_FLOAT, 0, NULL );
AssertNoGLError(); AssertNoGLError();
@@ -1156,7 +1154,7 @@ void RageCompiledGeometryHWOGL::Draw( int iMeshIndex ) const
glDisableClientState(GL_COLOR_ARRAY); glDisableClientState(GL_COLOR_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY);
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nTextureCoords ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nTextureCoords );
AssertNoGLError(); AssertNoGLError();
glTexCoordPointer(2, GL_FLOAT, 0, NULL); glTexCoordPointer(2, GL_FLOAT, 0, NULL);
AssertNoGLError(); AssertNoGLError();
@@ -1172,7 +1170,7 @@ void RageCompiledGeometryHWOGL::Draw( int iMeshIndex ) const
if( bLighting || bTextureGenS || bTextureGenT ) if( bLighting || bTextureGenS || bTextureGenT )
{ {
glEnableClientState(GL_NORMAL_ARRAY); glEnableClientState(GL_NORMAL_ARRAY);
GLExt::glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nNormals ); GLExt.glBindBufferARB( GL_ARRAY_BUFFER_ARB, m_nNormals );
AssertNoGLError(); AssertNoGLError();
glNormalPointer(GL_FLOAT, 0, NULL); glNormalPointer(GL_FLOAT, 0, NULL);
AssertNoGLError(); AssertNoGLError();
@@ -1182,13 +1180,13 @@ void RageCompiledGeometryHWOGL::Draw( int iMeshIndex ) const
glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_NORMAL_ARRAY);
} }
GLExt::glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_nTriangles ); GLExt.glBindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, m_nTriangles );
AssertNoGLError(); AssertNoGLError();
#define BUFFER_OFFSET(o) ((char*)(o)) #define BUFFER_OFFSET(o) ((char*)(o))
ASSERT( GLExt::glDrawRangeElements); ASSERT( GLExt.glDrawRangeElements);
GLExt::glDrawRangeElements( GLExt.glDrawRangeElements(
GL_TRIANGLES, GL_TRIANGLES,
meshInfo.iVertexStart, // minimum array index contained in indices meshInfo.iVertexStart, // minimum array index contained in indices
meshInfo.iVertexStart+meshInfo.iVertexCount-1, meshInfo.iVertexStart+meshInfo.iVertexCount-1,
@@ -1201,7 +1199,7 @@ void RageCompiledGeometryHWOGL::Draw( int iMeshIndex ) const
RageCompiledGeometry* RageDisplay_OGL::CreateCompiledGeometry() RageCompiledGeometry* RageDisplay_OGL::CreateCompiledGeometry()
{ {
if( GLExt::glGenBuffersARB ) if( GLExt.glGenBuffersARB )
return new RageCompiledGeometryHWOGL; return new RageCompiledGeometryHWOGL;
else else
return new RageCompiledGeometrySWOGL; return new RageCompiledGeometrySWOGL;
@@ -1343,13 +1341,13 @@ void RageDisplay_OGL::ClearAllTextures()
// HACK: Reset the active texture to 0. // HACK: Reset the active texture to 0.
// TODO: Change all texture functions to take a stage number. // TODO: Change all texture functions to take a stage number.
if( GLExt::glActiveTextureARB ) if( GLExt.glActiveTextureARB )
GLExt::glActiveTextureARB(GL_TEXTURE0_ARB); GLExt.glActiveTextureARB(GL_TEXTURE0_ARB);
} }
void RageDisplay_OGL::SetTexture( int iTextureUnitIndex, RageTexture* pTexture ) void RageDisplay_OGL::SetTexture( int iTextureUnitIndex, RageTexture* pTexture )
{ {
if( GLExt::glActiveTextureARB == NULL ) if( GLExt.glActiveTextureARB == NULL )
{ {
// multitexture isn't supported. Ignore all textures except for 0. // multitexture isn't supported. Ignore all textures except for 0.
if( iTextureUnitIndex != 0 ) if( iTextureUnitIndex != 0 )
@@ -1360,10 +1358,10 @@ void RageDisplay_OGL::SetTexture( int iTextureUnitIndex, RageTexture* pTexture )
switch( iTextureUnitIndex ) switch( iTextureUnitIndex )
{ {
case 0: case 0:
GLExt::glActiveTextureARB(GL_TEXTURE0_ARB); GLExt.glActiveTextureARB(GL_TEXTURE0_ARB);
break; break;
case 1: case 1:
GLExt::glActiveTextureARB(GL_TEXTURE1_ARB); GLExt.glActiveTextureARB(GL_TEXTURE1_ARB);
break; break;
default: default:
ASSERT(0); ASSERT(0);
@@ -1716,10 +1714,10 @@ unsigned RageDisplay_OGL::CreateTexture(
} }
/* Set the palette. */ /* Set the palette. */
GLExt::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);
GLint RealFormat = 0; GLint RealFormat = 0;
GLExt::glGetColorTableParameterivEXT(GL_TEXTURE_2D, GL_COLOR_TABLE_FORMAT, &RealFormat); GLExt.glGetColorTableParameterivEXT(GL_TEXTURE_2D, GL_COLOR_TABLE_FORMAT, &RealFormat);
ASSERT( RealFormat == GL_RGBA8); /* This is a case I don't expect to happen. */ ASSERT( RealFormat == GL_RGBA8); /* This is a case I don't expect to happen. */
} }
@@ -1880,7 +1878,7 @@ bool RageDisplay_OGL::SupportsTextureFormat( PixelFormat pixfmt, bool realtime )
switch( GL_PIXFMT_INFO[pixfmt].format ) switch( GL_PIXFMT_INFO[pixfmt].format )
{ {
case GL_COLOR_INDEX: case GL_COLOR_INDEX:
return GLExt::glColorTableEXT && GLExt::glGetColorTableParameterivEXT; return GLExt.glColorTableEXT && GLExt.glGetColorTableParameterivEXT;
case GL_BGR: case GL_BGR:
case GL_BGRA: case GL_BGRA:
return g_bGL_EXT_bgra; return g_bGL_EXT_bgra;