[qfusion-cvs-commits] SF.net SVN: l33t: [788] trunk/qfusion/source/ref_gl

[qfusion s. c. <l33...@li...>]

Revision: 788
          http://l33t.svn.sourceforge.net/l33t/?rev=788&view=rev
Author:   digiman
Date:     2007-12-03 13:24:42 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
misc small changes

Modified Paths:
--------------
    trunk/qfusion/source/ref_gl/r_main.c
    trunk/qfusion/source/ref_gl/r_public.h
    trunk/qfusion/source/ref_gl/r_register.c

Modified: trunk/qfusion/source/ref_gl/r_main.c
===================================================================
--- trunk/qfusion/source/ref_gl/r_main.c	2007-12-03 19:49:05 UTC (rev 787)
+++ trunk/qfusion/source/ref_gl/r_main.c	2007-12-03 21:24:42 UTC (rev 788)
@@ -638,6 +638,7 @@
 */
 static void R_PushCorona( const meshbuffer_t *mb )
 {
+	int i;
 	vec4_t color;
 	vec3_t origin, point;
 	dlight_t *light = r_dlights + (-mb->infokey - 1);
@@ -661,14 +662,11 @@
 		light->color[1] * colorscale,
 		light->color[2] * colorscale,
 		255 );
-	clamp( color[0], 0, 255 );
-	clamp( color[1], 0, 255 );
-	clamp( color[2], 0, 255 );
+	for( i = 0; i < 4; i++ )
+		clamp( color[i], 0, 255 );
 
-	Vector4Copy( color, spr_color[0] );
-	Vector4Copy( color, spr_color[1] );
-	Vector4Copy( color, spr_color[2] );
-	Vector4Copy( color, spr_color[3] );
+	for( i = 0; i < 4; i++ )
+		Vector4Copy( color, spr_color[i] );
 
 	MB_NUM2SHADER( mb->shaderkey, shader );
 
@@ -923,7 +921,7 @@
 R_PolyBlend
 ============
 */
-void R_PolyBlend (void)
+static void R_PolyBlend (void)
 {
 	if( !r_polyblend->integer )
 		return;
@@ -960,7 +958,7 @@
 R_ApplySoftwareGamma
 ===============
 */
-void R_ApplySoftwareGamma( void )
+static void R_ApplySoftwareGamma( void )
 {
 	double f, div;
 

Modified: trunk/qfusion/source/ref_gl/r_public.h
===================================================================
--- trunk/qfusion/source/ref_gl/r_public.h	2007-12-03 19:49:05 UTC (rev 787)
+++ trunk/qfusion/source/ref_gl/r_public.h	2007-12-03 21:24:42 UTC (rev 788)
@@ -60,7 +60,6 @@
 
 void	R_BeginFrame( float cameraSeparation, qboolean forceClear );
 void	R_EndFrame( void );
-void	R_ApplySoftwareGamma( void );
 
 void	R_BeginAviDemo( void );
 void	R_WriteAviFrame( int frame, qboolean scissor );

Modified: trunk/qfusion/source/ref_gl/r_register.c
===================================================================
--- trunk/qfusion/source/ref_gl/r_register.c	2007-12-03 19:49:05 UTC (rev 787)
+++ trunk/qfusion/source/ref_gl/r_register.c	2007-12-03 21:24:42 UTC (rev 788)
@@ -18,7 +18,7 @@
 
 */
 
-// r_main.c
+// r_register.c
 #include "r_local.h"
 
 glconfig_t	glConfig;
@@ -513,7 +513,6 @@
 
 //=======================================================================
 
-
 /*
 ==================
 R_Register
@@ -706,10 +705,24 @@
 
 /*
 ===============
+R_SetDefaultTexState
+===============
+*/
+static void R_SetDefaultTexState( void )
+{
+	memset( glState.currentTextures, -1, MAX_TEXTURE_UNITS*sizeof(*glState.currentTextures) );
+	memset( glState.currentEnvModes, -1, MAX_TEXTURE_UNITS*sizeof(*glState.currentEnvModes) );
+	memset( glState.texIdentityMatrix, 0, MAX_TEXTURE_UNITS*sizeof(*glState.texIdentityMatrix) );
+	memset( glState.genSTEnabled, 0, MAX_TEXTURE_UNITS*sizeof(*glState.genSTEnabled) );
+	memset( glState.texCoordArrayMode, 0, MAX_TEXTURE_UNITS*sizeof(*glState.texCoordArrayMode) );
+}
+
+/*
+===============
 R_SetDefaultState
 ===============
 */
-void R_SetDefaultState( void )
+static void R_SetDefaultState( void )
 {
 	// FIXME: dynamically allocate these?
 	static GLuint r_currentTextures[MAX_TEXTURE_UNITS];
@@ -720,18 +733,13 @@
 
 	memset( &glState, 0, sizeof(glState) );
 
-	glState.currentTMU = 0;
 	glState.currentTextures = r_currentTextures;
 	glState.currentEnvModes = r_currentEnvModes;
 	glState.texIdentityMatrix = r_texIdentityMatrix;
 	glState.genSTEnabled = r_genSTEnabled;
 	glState.texCoordArrayMode = r_texCoordArrayMode;
 
-	memset( glState.currentTextures, -1, MAX_TEXTURE_UNITS*sizeof(*glState.currentTextures) );
-	memset( glState.currentEnvModes, -1, MAX_TEXTURE_UNITS*sizeof(*glState.currentEnvModes) );
-	memset( glState.texIdentityMatrix, 0, MAX_TEXTURE_UNITS*sizeof(*glState.texIdentityMatrix) );
-	memset( glState.genSTEnabled, 0, MAX_TEXTURE_UNITS*sizeof(*glState.genSTEnabled) );
-	memset( glState.texCoordArrayMode, 0, MAX_TEXTURE_UNITS*sizeof(*glState.texCoordArrayMode) );
+	R_SetDefaultTexState ();
 
 	// set our "safe" modes
 	glState.previousMode = 3;
@@ -989,6 +997,8 @@
 	R_InitOcclusionQueries ();
 	R_InitCustomColors ();
 
+	R_SetDefaultTexState ();
+
 	memset( &ri, 0, sizeof( refinst_t ) );
 
 	glState.initializedMedia = qtrue;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.