aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-11-26 17:51:26 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-11-26 17:51:26 +0000
commit303aba65f53f564c710313e0de6cf1bf1c04ac9a (patch)
tree5360c9f222804321341bd8dac28c067ccf904a3c
parent59b6a5ccdb397cdd3a47c97d6cda5438a225a338 (diff)
downloadioquake3-aero-303aba65f53f564c710313e0de6cf1bf1c04ac9a.tar.gz
ioquake3-aero-303aba65f53f564c710313e0de6cf1bf1c04ac9a.zip
* Moved win32 GL extension prototypes from tr_init.c to win_qgl.c
git-svn-id: svn://svn.icculus.org/quake3/trunk@376 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/renderer/tr_init.c10
-rw-r--r--code/win32/win_qgl.c6
2 files changed, 6 insertions, 10 deletions
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
index c8a2804..ca0c26f 100644
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@@ -150,16 +150,6 @@ int max_polys;
cvar_t *r_maxpolyverts;
int max_polyverts;
-/* !!! FIXME: Why are these here?! */
-#if 0
-void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s, GLfloat t );
-void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
-void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
-
-void ( APIENTRY * qglLockArraysEXT)( GLint, GLint);
-void ( APIENTRY * qglUnlockArraysEXT) ( void );
-#endif
-
static void AssertCvarRange( cvar_t *cv, float minVal, float maxVal, qboolean shouldBeIntegral )
{
if ( shouldBeIntegral )
diff --git a/code/win32/win_qgl.c b/code/win32/win_qgl.c
index 9a4354f..68049c4 100644
--- a/code/win32/win_qgl.c
+++ b/code/win32/win_qgl.c
@@ -405,6 +405,12 @@ void ( APIENTRY * qglVertex4sv )(const GLshort *v);
void ( APIENTRY * qglVertexPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
void ( APIENTRY * qglViewport )(GLint x, GLint y, GLsizei width, GLsizei height);
+void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s, GLfloat t );
+void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
+void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
+
+void ( APIENTRY * qglLockArraysEXT)( GLint, GLint);
+void ( APIENTRY * qglUnlockArraysEXT) ( void );
static void ( APIENTRY * dllAccum )(GLenum op, GLfloat value);