fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

gl_vidnt.c (GL_MTexCoord2fFunc, GL_SelectTextureFunc): these aren't externs

Browse source 
in this file. made it to look like gl_vidsdl.c.
glquake.h: removed commented out multitexture stuff.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@126 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2010-04-23 09:50:44 +00:00
parent 4443dbc333
commit 0521495d86
2 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Quake/gl_vidnt.c
View file

@ -131,8 +131,8 @@ PROC glVertexPointerEXT;
typedef void (APIENTRY *lp3DFXFUNC) (int, int, int, int, int, const void*); typedef void (APIENTRY *lp3DFXFUNC) (int, int, int, int, int, const void*);
extern MTEXCOORDFUNC GL_MTexCoord2fFunc = NULL; //johnfitz PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc = NULL; //johnfitz
extern SELECTTEXFUNC GL_SelectTextureFunc = NULL; //johnfitz PFNGLACTIVETEXTUREARBPROC GL_SelectTextureFunc = NULL; //johnfitz
typedef BOOL (APIENTRY * SETSWAPFUNC) (int); //johnfitz typedef BOOL (APIENTRY * SETSWAPFUNC) (int); //johnfitz
typedef int (APIENTRY * GETSWAPFUNC) (void); //johnfitz typedef int (APIENTRY * GETSWAPFUNC) (void); //johnfitz

15
Quake/glquake.h
View file

@ -168,24 +168,11 @@ extern const char *gl_extensions;
// Multitexture // Multitexture
#define TEXTURE0_SGIS 0x835E #define TEXTURE0_SGIS 0x835E
#define TEXTURE1_SGIS 0x835F #define TEXTURE1_SGIS 0x835F
//#define APIENTRY /* */
//johnfitz -- modified multitexture support //johnfitz -- modified multitexture support
/*
typedef void (APIENTRY *SELECTTEXFUNC) (GLenum);
typedef void (APIENTRY *MTEXCOORDFUNC) (GLenum, GLfloat, GLfloat);
extern MTEXCOORDFUNC GL_MTexCoord2fFunc;
extern SELECTTEXFUNC GL_SelectTextureFunc;
#define GL_TEXTURE0_ARB 0x84C0
#define GL_TEXTURE1_ARB 0x84C1
*/
//johnfitz
extern PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc; extern PFNGLMULTITEXCOORD2FARBPROC GL_MTexCoord2fFunc;
extern PFNGLACTIVETEXTUREARBPROC GL_SelectTextureFunc; extern PFNGLACTIVETEXTUREARBPROC GL_SelectTextureFunc;
extern GLenum TEXTURE0, TEXTURE1; extern GLenum TEXTURE0, TEXTURE1;
//johnfitz
//johnfitz -- anisotropic filtering //johnfitz -- anisotropic filtering
#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE