qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-26 14:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

removing the bindtexture extension

Browse source
This commit is contained in:
Joseph Carter 2000-06-10 21:48:15 +00:00
parent d3dbe394ce
commit c7499f8a68
3 changed files with 4 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/glquake.h
View file

@ -75,7 +75,6 @@ typedef void (GLAPIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *,
const GLclampf *); const GLclampf *);
typedef void (GLAPIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); typedef void (GLAPIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *);
extern BINDTEXFUNCPTR bindTexFunc;
extern DELTEXFUNCPTR delTexFunc; extern DELTEXFUNCPTR delTexFunc;
extern TEXSUBIMAGEPTR TexSubImage2DFunc; extern TEXSUBIMAGEPTR TexSubImage2DFunc;
@ -265,8 +264,6 @@ void R_DrawSkyChain (msurface_t *s);
void R_LoadSkys (char *); void R_LoadSkys (char *);
void R_ClearSkyBox (void); void R_ClearSkyBox (void);
void R_DrawSkyBox (void); void R_DrawSkyBox (void);
byte *LoadTGA (FILE *fin);
byte *LoadPCX (FILE *f);
// //
// gl_draw.c // gl_draw.c

4
source/gl_draw.c
View file

@ -129,11 +129,7 @@ void GL_Bind (int texnum)
if (currenttexture == texnum) if (currenttexture == texnum)
return; return;
currenttexture = texnum; currenttexture = texnum;
#ifdef _WIN32
bindTexFunc (GL_TEXTURE_2D, texnum);
#else
glBindTexture (GL_TEXTURE_2D, texnum); glBindTexture (GL_TEXTURE_2D, texnum);
#endif
} }

51
source/vid_wgl.c
View file

@ -152,8 +152,6 @@ typedef void (APIENTRY *lp3DFXFUNC) (int, int, int, int, int, const void*);
lp3DFXFUNC glColorTableEXT; lp3DFXFUNC glColorTableEXT;
qboolean is8bit = false; qboolean is8bit = false;
qboolean isPermedia = false; qboolean isPermedia = false;
int gl_mtex_enum = TEXTURE0_SGIS;
qboolean gl_arb_mtex = false;
qboolean gl_mtexable = false; qboolean gl_mtexable = false;
//==================================== //====================================
@ -519,51 +517,6 @@ void VID_UpdateWindowStatus (void)
} }
//====================================
BINDTEXFUNCPTR bindTexFunc;
#define TEXTURE_EXT_STRING "GL_EXT_texture_object"
void CheckTextureExtensions (void)
{
char *tmp;
qboolean texture_ext;
HINSTANCE hInstGL;
texture_ext = FALSE;
/* check for texture extension */
tmp = (unsigned char *)glGetString(GL_EXTENSIONS);
while (*tmp)
{
if (strncmp((const char*)tmp, TEXTURE_EXT_STRING, strlen(TEXTURE_EXT_STRING)) == 0)
texture_ext = TRUE;
tmp++;
}
if (!texture_ext || COM_CheckParm ("-gl11") )
{
hInstGL = LoadLibrary("opengl32.dll");
if (hInstGL == NULL)
Sys_Error ("Couldn't load opengl32.dll\n");
bindTexFunc = (void *)GetProcAddress(hInstGL,"glBindTexture");
if (!bindTexFunc)
Sys_Error ("No texture objects!");
return;
}
/* load library and get procedure adresses for texture extension API */
if ((bindTexFunc = (BINDTEXFUNCPTR)
wglGetProcAddress((LPCSTR) "glBindTextureEXT")) == NULL)
{
Sys_Error ("GetProcAddress for BindTextureEXT failed");
return;
}
}
void CheckArrayExtensions (void) void CheckArrayExtensions (void)
{ {
@ -614,9 +567,9 @@ void CheckMultiTextureExtensions(void)
{ {
Con_Printf ("GL_ARB_multitexture\n"); Con_Printf ("GL_ARB_multitexture\n");
qglMTexCoord2f = qglMTexCoord2f =
(void *)wglGetProcAddress("glMultiTexCoord2fARB"); (void *)wglGetProcAddress("glMTexCoord2fARB");
qglSelectTexture = qglSelectTexture =
(void *) wglGetProcAddress("glActiveTextureARB"); (void *)wglGetProcAddress("glSelectTextureARB");
gl_mtex_enum = GL_TEXTURE0_ARB; gl_mtex_enum = GL_TEXTURE0_ARB;
gl_mtexable = true; gl_mtexable = true;
gl_arb_mtex = true; gl_arb_mtex = true;