Skip to content

Commit

Permalink
* Revert 1176 -- MinGW's headers are too old *sigh*
Browse files Browse the repository at this point in the history 
* Revert to using literal function pointers for GL extensions rather than PFN*
  typedefs as some platforms' headers are broken enough that they prevent
  SDL_opengl.h from fixing things up if the PFN* typedefs are missing
  • Loading branch information
@timangus
timangus committed Sep 12, 2007
1 parent 4f4f0c0 commit 1d54a9e
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 46 deletions.
27 changes: 7 additions & 20 deletions code/renderer/qgl.h
View file
Expand Up @@ -28,8 +28,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

#include "SDL_opengl.h"

extern PFNGLLOCKARRAYSEXTPROC qglLockArraysEXT;
extern PFNGLUNLOCKARRAYSEXTPROC qglUnlockArraysEXT;
extern void (APIENTRYP qglActiveTextureARB) (GLenum texture);
extern void (APIENTRYP qglClientActiveTextureARB) (GLenum texture);
extern void (APIENTRYP qglMultiTexCoord2fARB) (GLenum target, GLfloat s, GLfloat t);

extern void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count);
extern void (APIENTRYP qglUnlockArraysEXT) (void);


//===========================================================================

Expand Down Expand Up @@ -367,23 +372,5 @@ extern PFNGLUNLOCKARRAYSEXTPROC qglUnlockArraysEXT;
#define qglVertex4sv glVertex4sv
#define qglVertexPointer glVertexPointer
#define qglViewport glViewport
#define qglMultiTexCoord1s glMultiTexCoord1s
#define qglMultiTexCoord1i glMultiTexCoord1i
#define qglMultiTexCoord1f glMultiTexCoord1f
#define qglMultiTexCoord1d glMultiTexCoord1d
#define qglMultiTexCoord2s glMultiTexCoord2s
#define qglMultiTexCoord2i glMultiTexCoord2i
#define qglMultiTexCoord2f glMultiTexCoord2f
#define qglMultiTexCoord2d glMultiTexCoord2d
#define qglMultiTexCoord3s glMultiTexCoord3s
#define qglMultiTexCoord3i glMultiTexCoord3i
#define qglMultiTexCoord3f glMultiTexCoord3f
#define qglMultiTexCoord3d glMultiTexCoord3d
#define qglMultiTexCoord4s glMultiTexCoord4s
#define qglMultiTexCoord4i glMultiTexCoord4i
#define qglMultiTexCoord4f glMultiTexCoord4f
#define qglMultiTexCoord4d glMultiTexCoord4d
#define qglActiveTexture glActiveTexture
#define qglClientActiveTexture glClientActiveTexture

#endif
16 changes: 8 additions & 8 deletions code/renderer/tr_backend.c
View file
Expand Up @@ -71,17 +71,17 @@ void GL_SelectTexture( int unit )

if ( unit == 0 )
{
qglActiveTexture( GL_TEXTURE0 );
GLimp_LogComment( "glActiveTexture( GL_TEXTURE0 )\n" );
qglClientActiveTexture( GL_TEXTURE0 );
GLimp_LogComment( "glClientActiveTexture( GL_TEXTURE0 )\n" );
qglActiveTextureARB( GL_TEXTURE0_ARB );
GLimp_LogComment( "glActiveTextureARB( GL_TEXTURE0_ARB )\n" );
qglClientActiveTextureARB( GL_TEXTURE0_ARB );
GLimp_LogComment( "glClientActiveTextureARB( GL_TEXTURE0_ARB )\n" );
}
else if ( unit == 1 )
{
qglActiveTexture( GL_TEXTURE1 );
GLimp_LogComment( "glActiveTexture( GL_TEXTURE1 )\n" );
qglClientActiveTexture( GL_TEXTURE1 );
GLimp_LogComment( "glClientActiveTexture( GL_TEXTURE1 )\n" );
qglActiveTextureARB( GL_TEXTURE1_ARB );
GLimp_LogComment( "glActiveTextureARB( GL_TEXTURE1_ARB )\n" );
qglClientActiveTextureARB( GL_TEXTURE1_ARB );
GLimp_LogComment( "glClientActiveTextureARB( GL_TEXTURE1_ARB )\n" );
} else {
ri.Error( ERR_DROP, "GL_SelectTexture: unit = %i", unit );
}
Expand Down
6 changes: 3 additions & 3 deletions code/renderer/tr_image.c
View file
Expand Up @@ -765,13 +765,13 @@ image_t *R_CreateImage( const char *name, const byte *pic, int width, int height
image->wrapClampMode = glWrapClampMode;

// lightmaps are always allocated on TMU 1
if ( glConfig.numTextureUnits > 1 && isLightmap ) {
if ( qglActiveTextureARB && isLightmap ) {
image->TMU = 1;
} else {
image->TMU = 0;
}

if ( glConfig.numTextureUnits > 1 ) {
if ( qglActiveTextureARB ) {
GL_SelectTexture( image->TMU );
}

Expand Down Expand Up @@ -4849,7 +4849,7 @@ void R_DeleteTextures( void ) {
tr.numImages = 0;

Com_Memset( glState.currenttextures, 0, sizeof( glState.currenttextures ) );
if ( glConfig.numTextureUnits > 1 ) {
if ( qglActiveTextureARB ) {
GL_SelectTexture( 1 );
qglBindTexture( GL_TEXTURE_2D, 0 );
GL_SelectTexture( 0 );
Expand Down
8 changes: 5 additions & 3 deletions code/renderer/tr_init.c
View file
Expand Up @@ -80,6 +80,7 @@ cvar_t *r_nocurves;
cvar_t *r_allowExtensions;

cvar_t *r_ext_compressed_textures;
cvar_t *r_ext_multitexture;
cvar_t *r_ext_compiled_vertex_array;
cvar_t *r_ext_texture_env_add;
cvar_t *r_ext_texture_filter_anisotropic;
Expand Down Expand Up @@ -759,7 +760,7 @@ void GL_SetDefaultState( void )

// initialize downstream texture unit if we're running
// in a multitexture environment
if ( glConfig.numTextureUnits > 1 ) {
if ( qglActiveTextureARB ) {
GL_SelectTexture( 1 );
GL_TextureMode( r_textureMode->string );
GL_TexEnv( GL_MODULATE );
Expand Down Expand Up @@ -815,7 +816,7 @@ void GfxInfo_f( void )
ri.Printf( PRINT_ALL, "GL_VERSION: %s\n", glConfig.version_string );
ri.Printf( PRINT_ALL, "GL_EXTENSIONS: %s\n", glConfig.extensions_string );
ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_UNITS: %d\n", glConfig.numTextureUnits );
ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits );
ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
ri.Printf( PRINT_ALL, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
if ( glConfig.displayFrequency )
Expand Down Expand Up @@ -863,7 +864,7 @@ void GfxInfo_f( void )
ri.Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
ri.Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[glConfig.numTextureUnits > 1] );
ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
ri.Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
Expand Down Expand Up @@ -899,6 +900,7 @@ void R_Register( void )
//
r_allowExtensions = ri.Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ext_compressed_textures = ri.Cvar_Get( "r_ext_compressed_textures", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_ext_multitexture = ri.Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ext_compiled_vertex_array = ri.Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE | CVAR_LATCH);
r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE | CVAR_LATCH);

Expand Down
1 change: 1 addition & 0 deletions code/renderer/tr_local.h
View file
Expand Up @@ -1041,6 +1041,7 @@ extern cvar_t *r_ignorehwgamma; // overrides hardware gamma capabilities

extern cvar_t *r_allowExtensions; // global enable/disable of OpenGL extensions
extern cvar_t *r_ext_compressed_textures; // these control use of specific extensions
extern cvar_t *r_ext_multitexture;
extern cvar_t *r_ext_compiled_vertex_array;
extern cvar_t *r_ext_texture_env_add;

Expand Down
4 changes: 2 additions & 2 deletions code/renderer/tr_shade.c
View file
Expand Up @@ -43,8 +43,8 @@ This is just for OpenGL conformance testing, it should never be the fastest
static void APIENTRY R_ArrayElementDiscrete( GLint index ) {
qglColor4ubv( tess.svars.colors[ index ] );
if ( glState.currenttmu ) {
qglMultiTexCoord2f( 0, tess.svars.texcoords[ 0 ][ index ][0], tess.svars.texcoords[ 0 ][ index ][1] );
qglMultiTexCoord2f( 1, tess.svars.texcoords[ 1 ][ index ][0], tess.svars.texcoords[ 1 ][ index ][1] );
qglMultiTexCoord2fARB( 0, tess.svars.texcoords[ 0 ][ index ][0], tess.svars.texcoords[ 0 ][ index ][1] );
qglMultiTexCoord2fARB( 1, tess.svars.texcoords[ 1 ][ index ][0], tess.svars.texcoords[ 1 ][ index ][1] );
} else {
qglTexCoord2fv( tess.svars.texcoords[ 0 ][ index ] );
}
Expand Down
2 changes: 1 addition & 1 deletion code/renderer/tr_shader.c
View file
Expand Up @@ -1761,7 +1761,7 @@ static qboolean CollapseMultitexture( void ) {
int i;
textureBundle_t tmpBundle;

if ( glConfig.numTextureUnits < 2 ) {
if ( !qglActiveTextureARB ) {
return qfalse;
}

Expand Down
57 changes: 48 additions & 9 deletions code/sdl/sdl_glimp.c
View file
Expand Up @@ -70,8 +70,12 @@ static SDL_Surface *screen = NULL;

cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obtained

PFNGLLOCKARRAYSEXTPROC qglLockArraysEXT;
PFNGLUNLOCKARRAYSEXTPROC qglUnlockArraysEXT;
void (APIENTRYP qglActiveTextureARB) (GLenum texture);
void (APIENTRYP qglClientActiveTextureARB) (GLenum texture);
void (APIENTRYP qglMultiTexCoord2fARB) (GLenum target, GLfloat s, GLfloat t);

void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count);
void (APIENTRYP qglUnlockArraysEXT) (void);

/*
===============
Expand All @@ -85,8 +89,8 @@ void GLimp_Shutdown( void )
SDL_QuitSubSystem( SDL_INIT_VIDEO );
screen = NULL;

memset( &glConfig, 0, sizeof( glConfig ) );
memset( &glState, 0, sizeof( glState ) );
Com_Memset( &glConfig, 0, sizeof( glConfig ) );
Com_Memset( &glState, 0, sizeof( glState ) );
}

/*
Expand Down Expand Up @@ -376,6 +380,46 @@ static void GLimp_InitExtensions( void )
ri.Printf( PRINT_ALL, "...GL_EXT_texture_env_add not found\n" );
}

// GL_ARB_multitexture
qglMultiTexCoord2fARB = NULL;
qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
if ( Q_stristr( glConfig.extensions_string, "GL_ARB_multitexture" ) )
{
if ( r_ext_multitexture->value )
{
qglMultiTexCoord2fARB = ( PFNGLMULTITEXCOORD2FARBPROC ) SDL_GL_GetProcAddress( "glMultiTexCoord2fARB" );
qglActiveTextureARB = ( PFNGLACTIVETEXTUREARBPROC ) SDL_GL_GetProcAddress( "glActiveTextureARB" );
qglClientActiveTextureARB = ( PFNGLCLIENTACTIVETEXTUREARBPROC ) SDL_GL_GetProcAddress( "glClientActiveTextureARB" );

if ( qglActiveTextureARB )
{
GLint glint = 0;
qglGetIntegerv( GL_MAX_TEXTURE_UNITS_ARB, &glint );
glConfig.numTextureUnits = (int) glint;
if ( glConfig.numTextureUnits > 1 )
{
ri.Printf( PRINT_ALL, "...using GL_ARB_multitexture\n" );
}
else
{
qglMultiTexCoord2fARB = NULL;
qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
ri.Printf( PRINT_ALL, "...not using GL_ARB_multitexture, < 2 texture units\n" );
}
}
}
else
{
ri.Printf( PRINT_ALL, "...ignoring GL_ARB_multitexture\n" );
}
}
else
{
ri.Printf( PRINT_ALL, "...GL_ARB_multitexture not found\n" );
}

// GL_EXT_compiled_vertex_array
if ( Q_stristr( glConfig.extensions_string, "GL_EXT_compiled_vertex_array" ) )
{
Expand Down Expand Up @@ -471,11 +515,6 @@ void GLimp_Init( void )
Q_strncpyz( glConfig.version_string, (char *) qglGetString (GL_VERSION), sizeof( glConfig.version_string ) );
Q_strncpyz( glConfig.extensions_string, (char *) qglGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) );

// multitexturing
qglGetIntegerv( GL_MAX_TEXTURE_UNITS, (GLint *)&glConfig.numTextureUnits );
if( glConfig.numTextureUnits < 2 )
ri.Printf( PRINT_ALL, "Insufficient texture units for multitexturing\n" );

// initialize extensions
GLimp_InitExtensions( );

Expand Down

0 comments on commit 1d54a9e

Please sign in to comment.