added support for single-quoted strings in COM_ParseTokenConsole

[xonotic/darkplaces.git] / gl_backend.c

diff --git a/gl_backend.c b/gl_backend.c
index 5770fb455e5e3517c2d5303befb1348f78aa496e..b77e5fb9e1c0604c1eb3e177f07b143f5a2ef56f 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -157,7 +157,7 @@ static void gl_backend_start(void)
                Con_Printf("glDrawRangeElements detected (max vertices %i, max indices %i)\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices);
        }
 
-       backendunits = min(MAX_TEXTUREUNITS, gl_textureunits);
+       backendunits = bound(1, gl_textureunits, MAX_TEXTUREUNITS);
        backendimageunits = backendunits;
        backendarrayunits = backendunits;
        if (gl_support_fragment_shader)
@@ -168,6 +168,8 @@ static void gl_backend_start(void)
                qglGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, (int *)&backendarrayunits);
                CHECKGLERROR
                Con_Printf("GLSL shader support detected: texture units = %i texenv, %i image, %i array\n", backendunits, backendimageunits, backendarrayunits);
+               backendimageunits = bound(1, backendimageunits, MAX_TEXTUREUNITS);
+               backendarrayunits = bound(1, backendarrayunits, MAX_TEXTUREUNITS);
        }
        else if (backendunits > 1)
                Con_Printf("multitexture detected: texture units = %i\n", backendunits);
@@ -244,7 +246,7 @@ void GL_SetupView_Orientation_Identity (void)
        memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
 }
 
-void GL_SetupView_Orientation_FromEntity(matrix4x4_t *matrix)
+void GL_SetupView_Orientation_FromEntity(const matrix4x4_t *matrix)
 {
        matrix4x4_t tempmatrix, basematrix;
        Matrix4x4_Invert_Simple(&tempmatrix, matrix);
@@ -863,7 +865,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *
        unsigned int numelements = numtriangles * 3;
        if (numvertices < 3 || numtriangles < 1)
        {
-               Con_Printf("R_Mesh_Draw(%d, %d, %d, %08p);\n", firstvertex, numvertices, numtriangles, elements);
+               Con_Printf("R_Mesh_Draw(%d, %d, %d, %8p);\n", firstvertex, numvertices, numtriangles, elements);
                return;
        }
        CHECKGLERROR