changed texrgbscale to int rather than float, this allowed me to change all remaining...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1799 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_backend.c b/gl_backend.c
index 4a15b6d852e332f9ed20317301a0674570b683f3..3e0c3ac373b90b3f2b8d0e62fcb8e6d6d7800d01 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -85,7 +85,7 @@ typedef struct buf_mesh_s
        int depthtest;
        int blendfunc1, blendfunc2;
        int textures[MAX_TEXTUREUNITS];
-       float texturergbscale[MAX_TEXTUREUNITS];
+       int texturergbscale[MAX_TEXTUREUNITS];
        int firsttriangle;
        int triangles;
        int firstvert;
@@ -384,7 +384,7 @@ static int mesh_depthtest;
 static int mesh_unit;
 static int mesh_clientunit;
 static int mesh_texture[MAX_TEXTUREUNITS];
-static float mesh_texturergbscale[MAX_TEXTUREUNITS];
+static int mesh_texturergbscale[MAX_TEXTUREUNITS];
 
 void GL_SetupTextureState(void)
 {
@@ -412,8 +412,8 @@ void GL_SetupTextureState(void)
                                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
                                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
                                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
-                               glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, mesh_texturergbscale[i]);CHECKGLERROR
-                               glTexEnvf(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1.0f);CHECKGLERROR
+                               glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, mesh_texturergbscale[i]);CHECKGLERROR
+                               glTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1);CHECKGLERROR
                        }
                        else
                        {
@@ -611,7 +611,7 @@ void GL_MeshState(buf_mesh_t *mesh)
                                {
                                        qglActiveTexture(GL_TEXTURE0_ARB + (mesh_unit = i));CHECKGLERROR
                                }
-                               glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (mesh_texturergbscale[i] = mesh->texturergbscale[i]));CHECKGLERROR
+                               glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (mesh_texturergbscale[i] = mesh->texturergbscale[i]));CHECKGLERROR
                        }
                }
        }
@@ -763,7 +763,7 @@ void R_Mesh_Finish(void)
                        glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR
                        if (gl_combine.integer)
                        {
-                               glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1.0f);CHECKGLERROR
+                               glTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1.0f);CHECKGLERROR
                        }
                        if (i > 0)
                        {

diff --git a/gl_backend.h b/gl_backend.h
index 0082501c2c8989848fdc01c95253628128983a03..ae14212956ff6837cfc9f9ce6b78b1e35e164791 100644 (file)
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -21,7 +21,7 @@ typedef struct
        int tex[MAX_TEXTUREUNITS];
        float *texcoords[MAX_TEXTUREUNITS];
        int texcoordstep[MAX_TEXTUREUNITS];
-       float texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
+       int texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
 }
 rmeshinfo_t;
 
@@ -36,7 +36,7 @@ typedef struct
        int numtriangles;
        int numverts;
        int tex[MAX_TEXTUREUNITS];
-       float texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
+       int texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
 
        // output
        int *index;

diff --git a/gl_draw.c b/gl_draw.c
index 330b13e9e2053aef32b7d5c9fd6d1546724bf245..7ff921e1165dbde807d7d0f99457f6a96d7121a3 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -327,7 +327,7 @@ void R_DrawQueue(void)
        glDisable(GL_CULL_FACE);
        glEnable(GL_BLEND);
        glEnable(GL_TEXTURE_2D);
-       glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+       glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
        chartexnum = R_GetTexture(char_texture);
 

diff --git a/r_clip.c b/r_clip.c
index 547bcda177792aeb7c649690fc7fd3359e55241b..cca91702601197ff098a6467362694ce180d02a4 100644 (file)
--- a/r_clip.c
+++ b/r_clip.c
@@ -886,7 +886,7 @@ void R_Clip_DisplayBuffer(void)
                memset(clipbuffertex, 0, sizeof(clipbuffertex));
                glTexImage2D(GL_TEXTURE_2D, 0, 1, 256, 256, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, clipbuffertex);
        }
-       glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+       glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
        if (lighthalf)