r376 - in trunk/code: renderer win32

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Nov 26 12:51:26 EST 2005


Author: tma
Date: 2005-11-26 12:51:26 -0500 (Sat, 26 Nov 2005)
New Revision: 376

Modified:
   trunk/code/renderer/tr_init.c
   trunk/code/win32/win_qgl.c
Log:
* Moved win32 GL extension prototypes from tr_init.c to win_qgl.c


Modified: trunk/code/renderer/tr_init.c
===================================================================
--- trunk/code/renderer/tr_init.c	2005-11-26 15:01:28 UTC (rev 375)
+++ trunk/code/renderer/tr_init.c	2005-11-26 17:51:26 UTC (rev 376)
@@ -150,16 +150,6 @@
 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 )

Modified: trunk/code/win32/win_qgl.c
===================================================================
--- trunk/code/win32/win_qgl.c	2005-11-26 15:01:28 UTC (rev 375)
+++ trunk/code/win32/win_qgl.c	2005-11-26 17:51:26 UTC (rev 376)
@@ -405,8 +405,14 @@
 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);
 static void ( APIENTRY * dllAlphaFunc )(GLenum func, GLclampf ref);
 GLboolean ( APIENTRY * dllAreTexturesResident )(GLsizei n, const GLuint *textures, GLboolean *residences);




More information about the quake3-commits mailing list