moved a number of msurface_t fields to a separate msurface_lightmapinfo_t structure...

[xonotic/darkplaces.git] / gl_backend.c

diff --git a/gl_backend.c b/gl_backend.c
index 149ef4d4f4116e0dfa37ecee90bfac677f2deaa2..36dbde80d44fe75cb558f7b2ad8d8b825a730226 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -878,13 +878,13 @@ void GL_Backend_RenumberElements(int *out, int count, const int *in, int offset)
 int paranoidblah = 0;
 void R_Mesh_Draw(int numverts, int numtriangles, const int *elements)
 {
-       int numelements = numtriangles * 3;
+       unsigned int numelements = numtriangles * 3;
        if (numverts == 0 || numtriangles == 0)
        {
                Con_Printf("R_Mesh_Draw(%d, %d, %08p);\n", numverts, numtriangles, elements);
                return;
        }
-       CHECKGLERROR
+       //CHECKGLERROR
        if (r_showtrispass)
        {
                R_Mesh_Draw_ShowTris(numverts, numtriangles, elements);
@@ -918,7 +918,7 @@ void R_Mesh_Draw(int numverts, int numtriangles, const int *elements)
                                        paranoidblah += *p;
                        }
                }
-               for (i = 0;i < numtriangles * 3;i++)
+               for (i = 0;i < (unsigned int) numtriangles * 3;i++)
                {
                        if (elements[i] < 0 || elements[i] >= numverts)
                        {
@@ -936,7 +936,7 @@ void R_Mesh_Draw(int numverts, int numtriangles, const int *elements)
                        unsigned int i, j;
                        const GLfloat *p;
                        qglBegin(GL_TRIANGLES);
-                       for (i = 0;i < numtriangles * 3;i++)
+                       for (i = 0;i < (unsigned int) numtriangles * 3;i++)
                        {
                                for (j = 0;j < backendarrayunits;j++)
                                {
@@ -1014,13 +1014,14 @@ void R_Mesh_Draw(int numverts, int numtriangles, const int *elements)
                }
                else if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
                {
-                       qglDrawRangeElements(GL_TRIANGLES, 0, numverts, numelements, GL_UNSIGNED_INT, elements);CHECKGLERROR
+                       qglDrawRangeElements(GL_TRIANGLES, 0, numverts, numelements, GL_UNSIGNED_INT, elements);
+                       CHECKGLERROR
                }
                else
                {
-                       qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, elements);CHECKGLERROR
+                       qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, elements);
+                       CHECKGLERROR
                }
-               CHECKGLERROR
        }
 }
 
@@ -1054,7 +1055,7 @@ void R_Mesh_Finish(void)
        }
        for (i = 0;i < backendunits;i++)
        {
-               GL_ActiveTexture(backendarrayunits - 1 - i);
+               GL_ActiveTexture(backendunits - 1 - i);
                qglDisable(GL_TEXTURE_1D);CHECKGLERROR
                qglDisable(GL_TEXTURE_2D);CHECKGLERROR
                if (gl_texture3d)