yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove last remnant of multitexturing. 

Pointed out by DanielGibson.
This commit is contained in:
Yamagi Burmeister 2016-12-18 09:46:56 +01:00
parent a774846659
commit 8fe8f832f8
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backends/generic/header/qgl.h
View File

@ -93,13 +93,6 @@
#define GL_OPERAND7_ALPHA_EXT 0x859F #define GL_OPERAND7_ALPHA_EXT 0x859F
#endif #endif
#ifdef _WIN32
GLAPI void APIENTRY glActiveTextureARB( GLenum texture );
GLAPI void APIENTRY glClientActiveTextureARB( GLenum texture );
GLAPI void APIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
GLAPI void APIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
#endif
// ======================================================================= // =======================================================================
/* /*
@ -118,11 +111,5 @@ extern void ( APIENTRY *qglPointParameterfvARB ) ( GLenum param,
const GLfloat *value ); const GLfloat *value );
extern void ( APIENTRY *qglColorTableEXT ) ( GLenum, GLenum, GLsizei, GLenum, extern void ( APIENTRY *qglColorTableEXT ) ( GLenum, GLenum, GLsizei, GLenum,
GLenum, const GLvoid * ); GLenum, const GLvoid * );
extern void ( APIENTRY *qglLockArraysEXT ) ( int, int );
extern void ( APIENTRY *qglUnlockArraysEXT ) ( void );
extern void ( APIENTRY *qglMultiTexCoord2fARB) ( GLenum, GLfloat, GLfloat );
extern void ( APIENTRY *qglMultiTexCoord2fvARB) ( GLenum, GLfloat* );
extern void ( APIENTRY *qglActiveTextureARB ) ( GLenum );
extern void ( APIENTRY *qglClientActiveTextureARB ) ( GLenum );
#endif #endif

11
src/backends/generic/qgl.c
View File

@ -43,12 +43,6 @@ void (APIENTRY *qglPointParameterfvARB)(GLenum param, const GLfloat *value);
void (APIENTRY *qglColorTableEXT)(GLenum, GLenum, GLsizei, GLenum, GLenum, void (APIENTRY *qglColorTableEXT)(GLenum, GLenum, GLsizei, GLenum, GLenum,
const GLvoid *); const GLvoid *);
void ( APIENTRY *qgl3DfxSetPaletteEXT ) ( GLuint * );
void ( APIENTRY *qglMultiTexCoord2fARB ) ( GLenum, GLfloat, GLfloat );
void ( APIENTRY *qglMultiTexCoord2fvARB) ( GLenum, GLfloat* );
void ( APIENTRY *qglActiveTextureARB ) ( GLenum );
void ( APIENTRY *qglClientActiveTextureARB ) ( GLenum );
/* ========================================================================= */ /* ========================================================================= */
void QGL_EXT_Reset ( void ) void QGL_EXT_Reset ( void )
@ -56,11 +50,6 @@ void QGL_EXT_Reset ( void )
qglPointParameterfARB = NULL; qglPointParameterfARB = NULL;
qglPointParameterfvARB = NULL; qglPointParameterfvARB = NULL;
qglColorTableEXT = NULL; qglColorTableEXT = NULL;
qgl3DfxSetPaletteEXT = NULL;
qglMultiTexCoord2fARB = NULL;
qglMultiTexCoord2fvARB = NULL;
qglActiveTextureARB = NULL;
qglClientActiveTextureARB = NULL;
} }
/* ========================================================================= */ /* ========================================================================= */

9
src/client/refresh/header/local.h
View File

@ -53,11 +53,6 @@
#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
#endif #endif
#ifndef GL_ARB_multitexture
#define GL_TEXTURE0_ARB 0x84C0
#define GL_TEXTURE1_ARB 0x84C1
#endif
#ifndef GL_VERSION_1_3 #ifndef GL_VERSION_1_3
#define GL_TEXTURE0 0x84C0 #define GL_TEXTURE0 0x84C0
#define GL_TEXTURE1 0x84C1 #define GL_TEXTURE1 0x84C1
@ -210,12 +205,8 @@ extern cvar_t *gl_lerpmodels;
extern cvar_t *gl_lightlevel; extern cvar_t *gl_lightlevel;
extern cvar_t *gl_overbrightbits; extern cvar_t *gl_overbrightbits;
extern cvar_t *gl_vertex_arrays;
extern cvar_t *gl_palettedtexture; extern cvar_t *gl_palettedtexture;
extern cvar_t *gl_multitexture;
extern cvar_t *gl_pointparameters; extern cvar_t *gl_pointparameters;
extern cvar_t *gl_mtexcombine;
extern cvar_t *gl_particle_min_size; extern cvar_t *gl_particle_min_size;
extern cvar_t *gl_particle_max_size; extern cvar_t *gl_particle_max_size;