]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_backend.c
cl_deathfade: new effect which makes the screen fade to dark red when you die......
[xonotic/darkplaces.git] / gl_backend.c
index cb2f2feaf9edc6dc9e1ee2272ad440ad408f6298..9647420f81f409b07da9f198228fb3dca79ca86a 100644 (file)
@@ -5,6 +5,7 @@
 cvar_t gl_mesh_drawrangeelements = {0, "gl_mesh_drawrangeelements", "1", "use glDrawRangeElements function if available instead of glDrawElements (for performance comparisons or bug testing)"};
 cvar_t gl_mesh_testarrayelement = {0, "gl_mesh_testarrayelement", "0", "use glBegin(GL_TRIANGLES);glArrayElement();glEnd(); primitives instead of glDrawElements (useful to test for driver bugs with glDrawElements)"};
 cvar_t gl_mesh_testmanualfeeding = {0, "gl_mesh_testmanualfeeding", "0", "use glBegin(GL_TRIANGLES);glTexCoord2f();glVertex3f();glEnd(); primitives instead of glDrawElements (useful to test for driver bugs with glDrawElements)"};
+cvar_t gl_mesh_prefer_short_elements = {0, "gl_mesh_prefer_short_elements", "1", "use GL_UNSIGNED_SHORT element arrays instead of GL_UNSIGNED_INT"};
 cvar_t gl_paranoid = {0, "gl_paranoid", "0", "enables OpenGL error checking and other tests"};
 cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0", "prints all OpenGL error checks, useful to identify location of driver crashes"};
 
@@ -14,6 +15,11 @@ cvar_t gl_polyblend = {CVAR_SAVE, "gl_polyblend", "1", "tints view while underwa
 cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1", "enables OpenGL dithering (16bit looks bad with this off)"};
 cvar_t gl_lockarrays = {0, "gl_lockarrays", "0", "enables use of glLockArraysEXT, may cause glitches with some broken drivers, and may be slower than normal"};
 cvar_t gl_lockarrays_minimumvertices = {0, "gl_lockarrays_minimumvertices", "1", "minimum number of vertices required for use of glLockArraysEXT, setting this too low may reduce performance"};
+cvar_t gl_vbo = {CVAR_SAVE, "gl_vbo", "3", "make use of GL_ARB_vertex_buffer_object extension to store static geometry in video memory for faster rendering, 0 disables VBO allocation or use, 1 enables VBOs for vertex and triangle data, 2 only for vertex data, 3 for vertex data and triangle data of simple meshes (ones with only one surface)"};
+cvar_t gl_fbo = {CVAR_SAVE, "gl_fbo", "1", "make use of GL_ARB_framebuffer_object extension to enable shadowmaps and other features using pixel formats different from the framebuffer"};
+
+cvar_t v_flipped = {0, "v_flipped", "0", "mirror the screen (poor man's left handed mode)"};
+qboolean v_flipped_state = false;
 
 int gl_maxdrawrangeelementsvertices;
 int gl_maxdrawrangeelementsindices;
@@ -132,8 +138,8 @@ for (y = 0;y < rows - 1;y++)
 }
 */
 
-int polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3];
-int quadelements[QUADELEMENTS_MAXQUADS*6];
+unsigned short polygonelements[(POLYGONELEMENTS_MAXPOINTS-2)*3];
+unsigned short quadelements[QUADELEMENTS_MAXQUADS*6];
 
 void GL_Backend_AllocArrays(void)
 {
@@ -143,9 +149,24 @@ void GL_Backend_FreeArrays(void)
 {
 }
 
+void GL_VBOStats_f(void)
+{
+       GL_Mesh_ListVBOs(true);
+}
+
+typedef struct gl_bufferobjectinfo_s
+{
+       int target;
+       int object;
+       size_t size;
+       char name[MAX_QPATH];
+}
+gl_bufferobjectinfo_t;
+
+memexpandablearray_t gl_bufferobjectinfoarray;
+
 static void gl_backend_start(void)
 {
-       Con_Print("OpenGL Backend starting...\n");
        CHECKGLERROR
 
        if (qglDrawRangeElements != NULL)
@@ -155,7 +176,7 @@ static void gl_backend_start(void)
                CHECKGLERROR
                qglGetIntegerv(GL_MAX_ELEMENTS_INDICES, &gl_maxdrawrangeelementsindices);
                CHECKGLERROR
-               Con_Printf("glDrawRangeElements detected (max vertices %i, max indices %i)\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices);
+               Con_DPrintf("GL_MAX_ELEMENTS_VERTICES = %i\nGL_MAX_ELEMENTS_INDICES = %i\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices);
        }
 
        backendunits = bound(1, gl_textureunits, MAX_TEXTUREUNITS);
@@ -168,18 +189,18 @@ static void gl_backend_start(void)
                CHECKGLERROR
                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);
+               Con_DPrintf("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);
        else
-               Con_Printf("singletexture\n");
+               Con_DPrintf("GL_MAX_TEXTUREUNITS = %i\n", backendunits);
 
        GL_Backend_AllocArrays();
 
-       Con_Printf("OpenGL backend started.\n");
+       Mem_ExpandableArray_NewArray(&gl_bufferobjectinfoarray, r_main_mempool, sizeof(gl_bufferobjectinfo_t), 128);
+
+       Con_DPrintf("OpenGL backend started.\n");
 
        CHECKGLERROR
 
@@ -193,7 +214,9 @@ static void gl_backend_shutdown(void)
        backendarrayunits = 0;
        backendactive = false;
 
-       Con_Print("OpenGL Backend shutting down\n");
+       Con_DPrint("OpenGL Backend shutting down\n");
+
+       Mem_ExpandableArray_FreeArray(&gl_bufferobjectinfoarray);
 
        GL_Backend_FreeArrays();
 }
@@ -226,9 +249,11 @@ void gl_backend_init(void)
        Cvar_RegisterVariable(&r_render);
        Cvar_RegisterVariable(&r_waterwarp);
        Cvar_RegisterVariable(&gl_polyblend);
+       Cvar_RegisterVariable(&v_flipped);
        Cvar_RegisterVariable(&gl_dither);
        Cvar_RegisterVariable(&gl_lockarrays);
        Cvar_RegisterVariable(&gl_lockarrays_minimumvertices);
+       Cvar_RegisterVariable(&gl_vbo);
        Cvar_RegisterVariable(&gl_paranoid);
        Cvar_RegisterVariable(&gl_printcheckerror);
 #ifdef NORENDER
@@ -238,28 +263,70 @@ void gl_backend_init(void)
        Cvar_RegisterVariable(&gl_mesh_drawrangeelements);
        Cvar_RegisterVariable(&gl_mesh_testarrayelement);
        Cvar_RegisterVariable(&gl_mesh_testmanualfeeding);
+       Cvar_RegisterVariable(&gl_mesh_prefer_short_elements);
+
+       Cmd_AddCommand("gl_vbostats", GL_VBOStats_f, "prints a list of all buffer objects (vertex data and triangle elements) and total video memory used by them");
 
        R_RegisterModule("GL_Backend", gl_backend_start, gl_backend_shutdown, gl_backend_newmap);
 }
 
+void GL_SetMirrorState(qboolean state);
+
 void GL_SetupView_Orientation_Identity (void)
 {
        backend_viewmatrix = identitymatrix;
+       GL_SetMirrorState(false);
        memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
 }
 
 void GL_SetupView_Orientation_FromEntity(const matrix4x4_t *matrix)
 {
        matrix4x4_t tempmatrix, basematrix;
-       Matrix4x4_Invert_Simple(&tempmatrix, matrix);
+       Matrix4x4_Invert_Full(&tempmatrix, matrix);
        Matrix4x4_CreateRotate(&basematrix, -90, 1, 0, 0);
        Matrix4x4_ConcatRotate(&basematrix, 90, 0, 0, 1);
        Matrix4x4_Concat(&backend_viewmatrix, &basematrix, &tempmatrix);
+
+       GL_SetMirrorState(v_flipped.integer);
+       if(v_flipped_state)
+       {
+               Matrix4x4_Transpose(&basematrix, &backend_viewmatrix);
+               Matrix4x4_ConcatScale3(&basematrix, -1, 1, 1);
+               Matrix4x4_Transpose(&backend_viewmatrix, &basematrix);
+       }
+
        //Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[2], 1, 0, 0);
        //Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[0], 0, 1, 0);
        //Matrix4x4_ConcatRotate(&backend_viewmatrix, -angles[1], 0, 0, 1);
        //Matrix4x4_ConcatTranslate(&backend_viewmatrix, -origin[0], -origin[1], -origin[2]);
+
+       // force an update of the model matrix by copying it off, resetting it, and then calling the R_Mesh_Matrix function with it
+       tempmatrix = backend_modelmatrix;
        memset(&backend_modelmatrix, 0, sizeof(backend_modelmatrix));
+       R_Mesh_Matrix(&tempmatrix);
+}
+
+static void GL_BuildFrustum(double m[16], double left, double right, double bottom, double top, double nearVal, double farVal)
+{
+       m[0]  = 2 * nearVal / (right - left);
+       m[1]  = 0;
+       m[2]  = 0;
+       m[3]  = 0;
+
+       m[4]  = 0;
+       m[5]  = 2 * nearVal / (top - bottom);
+       m[6]  = 0;
+       m[7]  = 0;
+
+       m[8]  = (right + left) / (right - left);
+       m[9]  = (top + bottom) / (top - bottom);
+       m[10] = - (farVal + nearVal) / (farVal - nearVal);
+       m[11] = -1;
+
+       m[12] = 0;
+       m[13] = 0;
+       m[14] = - 2 * farVal * nearVal / (farVal - nearVal);
+       m[15] = 0;
 }
 
 void GL_SetupView_Mode_Perspective (double frustumx, double frustumy, double zNear, double zFar)
@@ -269,10 +336,18 @@ void GL_SetupView_Mode_Perspective (double frustumx, double frustumy, double zNe
        // set up viewpoint
        CHECKGLERROR
        qglMatrixMode(GL_PROJECTION);CHECKGLERROR
-       qglLoadIdentity();CHECKGLERROR
        // set view pyramid
+#if 1
+       // avoid glGetDoublev whenever possible, it may stall the render pipeline
+       // in the tested cases (nvidia) no measurable fps difference, but it sure
+       // makes a difference over a network line with GLX
+       GL_BuildFrustum(m, -frustumx * zNear, frustumx * zNear, -frustumy * zNear, frustumy * zNear, zNear, zFar);
+       qglLoadMatrixd(m);CHECKGLERROR
+#else
+       qglLoadIdentity();CHECKGLERROR
        qglFrustum(-frustumx * zNear, frustumx * zNear, -frustumy * zNear, frustumy * zNear, zNear, zFar);CHECKGLERROR
        qglGetDoublev(GL_PROJECTION_MATRIX, m);CHECKGLERROR
+#endif
        Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m);
        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
        GL_SetupView_Orientation_Identity();
@@ -312,6 +387,29 @@ void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double frustumx, double frust
        Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m);
 }
 
+static void GL_BuildOrtho(double m[16], double left, double right, double bottom, double top, double zNear, double zFar)
+{
+       m[0]  = 2/(right - left);
+       m[1]  = 0;
+       m[2]  = 0;
+       m[3]  = 0;
+
+       m[4]  = 0;
+       m[5]  = 2/(top - bottom);
+       m[6]  = 0;
+       m[7]  = 0;
+
+       m[8]  = 0;
+       m[9]  = 0;
+       m[10] = -2/(zFar - zNear);
+       m[11] = 0;
+
+       m[12] = - (right + left)/(right - left);
+       m[13] = - (top + bottom)/(top - bottom);
+       m[14] = - (zFar + zNear)/(zFar - zNear);
+       m[15] = 1;
+}
+
 void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double zNear, double zFar)
 {
        double m[16];
@@ -319,15 +417,82 @@ void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double
        // set up viewpoint
        CHECKGLERROR
        qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+#if 1
+       // avoid glGetDoublev whenever possible, it may stall the render pipeline
+       // in the tested cases (nvidia) no measurable fps difference, but it sure
+       // makes a difference over a network line with GLX
+       GL_BuildOrtho(m, x1, x2, y2, y1, zNear, zFar);
+       qglLoadMatrixd(m);CHECKGLERROR
+#else
        qglLoadIdentity();CHECKGLERROR
        qglOrtho(x1, x2, y2, y1, zNear, zFar);CHECKGLERROR
        qglGetDoublev(GL_PROJECTION_MATRIX, m);CHECKGLERROR
+#endif
        Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, m);
        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
        GL_SetupView_Orientation_Identity();
        CHECKGLERROR
 }
 
+void GL_SetupView_ApplyCustomNearClipPlane(double normalx, double normaly, double normalz, double dist)
+{
+       double matrix[16];
+       double q[4];
+       double d;
+       float clipPlane[4], v3[3], v4[3];
+       float normal[3];
+
+       // This is Olique Depth Projection from http://www.terathon.com/code/oblique.php
+       // modified to fit in this codebase.
+
+       VectorSet(normal, normalx, normaly, normalz);
+       Matrix4x4_Transform3x3(&backend_viewmatrix, normal, clipPlane);
+       VectorScale(normal, dist, v3);
+       Matrix4x4_Transform(&backend_viewmatrix, v3, v4);
+       // FIXME: LordHavoc: I think this can be done more efficiently somehow but I can't remember the technique
+       clipPlane[3] = -DotProduct(v4, clipPlane);
+
+#if 0
+{
+       // testing code for comparing results
+       float clipPlane2[4];
+       VectorCopy4(clipPlane, clipPlane2);
+       R_Mesh_Matrix(&identitymatrix);
+       VectorSet(q, normal[0], normal[1], normal[2], -dist);
+       qglClipPlane(GL_CLIP_PLANE0, q);
+       qglGetClipPlane(GL_CLIP_PLANE0, q);
+       VectorCopy4(q, clipPlane);
+}
+#endif
+
+       // Calculate the clip-space corner point opposite the clipping plane
+       // as (sgn(clipPlane.x), sgn(clipPlane.y), 1, 1) and
+       // transform it into camera space by multiplying it
+       // by the inverse of the projection matrix
+       Matrix4x4_ToArrayDoubleGL(&backend_projectmatrix, matrix);
+
+       q[0] = ((clipPlane[0] < 0.0f ? -1.0f : clipPlane[0] > 0.0f ? 1.0f : 0.0f) + matrix[8]) / matrix[0];
+       q[1] = ((clipPlane[1] < 0.0f ? -1.0f : clipPlane[1] > 0.0f ? 1.0f : 0.0f) + matrix[9]) / matrix[5];
+       q[2] = -1.0f;
+       q[3] = (1.0f + matrix[10]) / matrix[14];
+
+       // Calculate the scaled plane vector
+       d = 2.0f / DotProduct4(clipPlane, q);
+
+       // Replace the third row of the projection matrix
+       matrix[2] = clipPlane[0] * d;
+       matrix[6] = clipPlane[1] * d;
+       matrix[10] = clipPlane[2] * d + 1.0f;
+       matrix[14] = clipPlane[3] * d;
+
+       // Load it back into OpenGL
+       qglMatrixMode(GL_PROJECTION);CHECKGLERROR
+       qglLoadMatrixd(matrix);CHECKGLERROR
+       qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+       CHECKGLERROR
+       Matrix4x4_FromArrayDoubleGL(&backend_projectmatrix, matrix);
+}
+
 typedef struct gltextureunit_s
 {
        const void *pointer_texcoord;
@@ -355,6 +520,8 @@ static struct gl_state_s
        GLboolean depthmask;
        int colormask; // stored as bottom 4 bits: r g b a (3 2 1 0 order)
        int depthtest;
+       float depthrange[2];
+       float polygonoffset[2];
        int alphatest;
        int scissortest;
        unsigned int unit;
@@ -505,8 +672,10 @@ void GL_Backend_ResetState(void)
        gl_state.color4f[0] = gl_state.color4f[1] = gl_state.color4f[2] = gl_state.color4f[3] = 1;
        gl_state.lockrange_first = 0;
        gl_state.lockrange_count = 0;
-       gl_state.cullface = GL_FRONT; // quake is backwards, this culls back faces
+       gl_state.cullface = v_flipped_state ? GL_BACK : GL_FRONT; // quake is backwards, this culls back faces
        gl_state.cullfaceenable = true;
+       gl_state.polygonoffset[0] = 0;
+       gl_state.polygonoffset[1] = 0;
 
        CHECKGLERROR
 
@@ -520,6 +689,7 @@ void GL_Backend_ResetState(void)
        qglDepthFunc(GL_LEQUAL);CHECKGLERROR
        qglEnable(GL_DEPTH_TEST);CHECKGLERROR
        qglDepthMask(gl_state.depthmask);CHECKGLERROR
+       qglPolygonOffset(gl_state.polygonoffset[0], gl_state.polygonoffset[1]);
 
        if (gl_support_arb_vertex_buffer_object)
        {
@@ -527,6 +697,12 @@ void GL_Backend_ResetState(void)
                qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
        }
 
+       if (gl_support_ext_framebuffer_object)
+       {
+               qglBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
+               qglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+       }
+
        qglVertexPointer(3, GL_FLOAT, sizeof(float[3]), NULL);CHECKGLERROR
        qglEnableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
 
@@ -629,9 +805,51 @@ void GL_DepthTest(int state)
        }
 }
 
+void GL_DepthRange(float nearfrac, float farfrac)
+{
+       if (gl_state.depthrange[0] != nearfrac || gl_state.depthrange[1] != farfrac)
+       {
+               gl_state.depthrange[0] = nearfrac;
+               gl_state.depthrange[1] = farfrac;
+               qglDepthRange(nearfrac, farfrac);
+       }
+}
+
+void GL_PolygonOffset(float planeoffset, float depthoffset)
+{
+       if (gl_state.polygonoffset[0] != planeoffset || gl_state.polygonoffset[1] != depthoffset)
+       {
+               gl_state.polygonoffset[0] = planeoffset;
+               gl_state.polygonoffset[1] = depthoffset;
+               qglPolygonOffset(planeoffset, depthoffset);
+       }
+}
+
+void GL_SetMirrorState(qboolean state)
+{
+       if(!state != !v_flipped_state)
+       {
+               // change cull face mode!
+               if(gl_state.cullface == GL_BACK)
+                       qglCullFace((gl_state.cullface = GL_FRONT));
+               else if(gl_state.cullface == GL_FRONT)
+                       qglCullFace((gl_state.cullface = GL_BACK));
+       }
+       v_flipped_state = state;
+}
+
 void GL_CullFace(int state)
 {
        CHECKGLERROR
+
+       if(v_flipped_state)
+       {
+               if(state == GL_FRONT)
+                       state = GL_BACK;
+               else if(state == GL_BACK)
+                       state = GL_FRONT;
+       }
+
        if (state != GL_NONE)
        {
                if (!gl_state.cullfaceenable)
@@ -757,9 +975,9 @@ void GL_TransformToScreen(const vec4_t in, vec4_t out)
        Matrix4x4_Transform4 (&backend_viewmatrix, in, temp);
        Matrix4x4_Transform4 (&backend_projectmatrix, temp, out);
        iw = 1.0f / out[3];
-       out[0] = r_view.x + (out[0] * iw + 1.0f) * r_view.width * 0.5f;
-       out[1] = r_view.y + r_view.height - (out[1] * iw + 1.0f) * r_view.height * 0.5f;
-       out[2] = r_view.z + (out[2] * iw + 1.0f) * r_view.depth * 0.5f;
+       out[0] = r_refdef.view.x + (out[0] * iw + 1.0f) * r_refdef.view.width * 0.5f;
+       out[1] = r_refdef.view.y + r_refdef.view.height - (out[1] * iw + 1.0f) * r_refdef.view.height * 0.5f;
+       out[2] = r_refdef.view.z + (out[2] * iw + 1.0f) * r_refdef.view.depth * 0.5f;
 }
 
 // called at beginning of frame
@@ -787,8 +1005,15 @@ qboolean GL_Backend_CompileShader(int programobject, GLenum shadertypeenum, cons
        qglCompileShaderARB(shaderobject);CHECKGLERROR
        qglGetObjectParameterivARB(shaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &shadercompiled);CHECKGLERROR
        qglGetInfoLogARB(shaderobject, sizeof(compilelog), NULL, compilelog);CHECKGLERROR
-       if (compilelog[0])
-               Con_DPrintf("%s shader compile log:\n%s\n", shadertype, compilelog);
+       if (compilelog[0] && developer.integer > 0)
+       {
+               int i, j, pretextlines = 0;
+               for (i = 0;i < numstrings - 1;i++)
+                       for (j = 0;strings[i][j];j++)
+                               if (strings[i][j] == '\n')
+                                       pretextlines++;
+               Con_DPrintf("%s shader compile log:\n%s\n(line offset for any above warnings/errors: %i)\n", shadertype, compilelog, pretextlines);
+       }
        if (!shadercompiled)
        {
                qglDeleteObjectARB(shaderobject);CHECKGLERROR
@@ -867,14 +1092,40 @@ void GL_Backend_RenumberElements(int *out, int count, const int *in, int offset)
 
 // renders triangles using vertices from the active arrays
 int paranoidblah = 0;
-void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *elements, int bufferobject, size_t bufferoffset)
+void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtriangles, const int *element3i, const unsigned short *element3s, int bufferobject3i, int bufferobject3s)
 {
        unsigned int numelements = numtriangles * 3;
        if (numvertices < 3 || numtriangles < 1)
        {
-               Con_Printf("R_Mesh_Draw(%d, %d, %d, %8p);\n", firstvertex, numvertices, numtriangles, elements);
+               if (numvertices < 0 || numtriangles < 0 || developer.integer >= 100)
+                       Con_Printf("R_Mesh_Draw(%d, %d, %d, %d, %8p, %8p, %i, %i);\n", firstvertex, numvertices, firsttriangle, numtriangles, (void *)element3i, (void *)element3s, bufferobject3i, bufferobject3s);
                return;
        }
+       if (!gl_mesh_prefer_short_elements.integer)
+       {
+               if (element3i)
+                       element3s = NULL;
+               if (bufferobject3i)
+                       bufferobject3s = 0;
+       }
+       if (element3i)
+               element3i += firsttriangle * 3;
+       if (element3s)
+               element3s += firsttriangle * 3;
+       switch (gl_vbo.integer)
+       {
+       default:
+       case 0:
+       case 2:
+               bufferobject3i = bufferobject3s = 0;
+               break;
+       case 1:
+               break;
+       case 3:
+               if (firsttriangle)
+                       bufferobject3i = bufferobject3s = 0;
+               break;
+       }
        CHECKGLERROR
        r_refdef.stats.meshes++;
        r_refdef.stats.meshes_elements += numelements;
@@ -915,12 +1166,26 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *
                                                paranoidblah += *p;
                        }
                }
-               for (i = 0;i < (unsigned int) numtriangles * 3;i++)
+               if (element3i)
                {
-                       if (elements[i] < firstvertex || elements[i] >= firstvertex + numvertices)
+                       for (i = 0;i < (unsigned int) numtriangles * 3;i++)
                        {
-                               Con_Printf("R_Mesh_Draw: invalid vertex index %i (outside range %i - %i) in elements list\n", elements[i], firstvertex, firstvertex + numvertices);
-                               return;
+                               if (element3i[i] < firstvertex || element3i[i] >= firstvertex + numvertices)
+                               {
+                                       Con_Printf("R_Mesh_Draw: invalid vertex index %i (outside range %i - %i) in element3i array\n", element3i[i], firstvertex, firstvertex + numvertices);
+                                       return;
+                               }
+                       }
+               }
+               if (element3s)
+               {
+                       for (i = 0;i < (unsigned int) numtriangles * 3;i++)
+                       {
+                               if (element3s[i] < firstvertex || element3s[i] >= firstvertex + numvertices)
+                               {
+                                       Con_Printf("R_Mesh_Draw: invalid vertex index %i (outside range %i - %i) in element3s array\n", element3s[i], firstvertex, firstvertex + numvertices);
+                                       return;
+                               }
                        }
                }
                CHECKGLERROR
@@ -930,11 +1195,12 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *
                CHECKGLERROR
                if (gl_mesh_testmanualfeeding.integer)
                {
-                       unsigned int i, j;
+                       unsigned int i, j, element;
                        const GLfloat *p;
                        qglBegin(GL_TRIANGLES);
                        for (i = 0;i < (unsigned int) numtriangles * 3;i++)
                        {
+                               element = element3i ? element3i[i] : element3s[i];
                                for (j = 0;j < backendarrayunits;j++)
                                {
                                        if (gl_state.units[j].pointer_texcoord && gl_state.units[j].arrayenabled)
@@ -943,22 +1209,22 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *
                                                {
                                                        if (gl_state.units[j].arraycomponents == 4)
                                                        {
-                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 4;
+                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + element * 4;
                                                                qglMultiTexCoord4f(GL_TEXTURE0_ARB + j, p[0], p[1], p[2], p[3]);
                                                        }
                                                        else if (gl_state.units[j].arraycomponents == 3)
                                                        {
-                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 3;
+                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + element * 3;
                                                                qglMultiTexCoord3f(GL_TEXTURE0_ARB + j, p[0], p[1], p[2]);
                                                        }
                                                        else if (gl_state.units[j].arraycomponents == 2)
                                                        {
-                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 2;
+                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + element * 2;
                                                                qglMultiTexCoord2f(GL_TEXTURE0_ARB + j, p[0], p[1]);
                                                        }
                                                        else
                                                        {
-                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 1;
+                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + element * 1;
                                                                qglMultiTexCoord1f(GL_TEXTURE0_ARB + j, p[0]);
                                                        }
                                                }
@@ -966,22 +1232,22 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *
                                                {
                                                        if (gl_state.units[j].arraycomponents == 4)
                                                        {
-                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 4;
+                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + element * 4;
                                                                qglTexCoord4f(p[0], p[1], p[2], p[3]);
                                                        }
                                                        else if (gl_state.units[j].arraycomponents == 3)
                                                        {
-                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 3;
+                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + element * 3;
                                                                qglTexCoord3f(p[0], p[1], p[2]);
                                                        }
                                                        else if (gl_state.units[j].arraycomponents == 2)
                                                        {
-                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 2;
+                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + element * 2;
                                                                qglTexCoord2f(p[0], p[1]);
                                                        }
                                                        else
                                                        {
-                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + elements[i] * 1;
+                                                               p = ((const GLfloat *)(gl_state.units[j].pointer_texcoord)) + element * 1;
                                                                qglTexCoord1f(p[0]);
                                                        }
                                                }
@@ -989,10 +1255,10 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *
                                }
                                if (gl_state.pointer_color && gl_state.pointer_color_enabled)
                                {
-                                       p = ((const GLfloat *)(gl_state.pointer_color)) + elements[i] * 4;
+                                       p = ((const GLfloat *)(gl_state.pointer_color)) + element * 4;
                                        qglColor4f(p[0], p[1], p[2], p[3]);
                                }
-                               p = ((const GLfloat *)(gl_state.pointer_vertex)) + elements[i] * 3;
+                               p = ((const GLfloat *)(gl_state.pointer_vertex)) + element * 3;
                                qglVertex3f(p[0], p[1], p[2]);
                        }
                        qglEnd();
@@ -1002,24 +1268,74 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int numtriangles, const int *
                {
                        int i;
                        qglBegin(GL_TRIANGLES);
-                       for (i = 0;i < numtriangles * 3;i++)
+                       if (element3i)
                        {
-                               qglArrayElement(elements[i]);
+                               for (i = 0;i < numtriangles * 3;i++)
+                                       qglArrayElement(element3i[i]);
+                       }
+                       else if (element3s)
+                       {
+                               for (i = 0;i < numtriangles * 3;i++)
+                                       qglArrayElement(element3s[i]);
                        }
                        qglEnd();
                        CHECKGLERROR
                }
-               else if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
+               else if (bufferobject3s)
                {
-                       GL_BindEBO(bufferobject);
-                       qglDrawRangeElements(GL_TRIANGLES, firstvertex, firstvertex + numvertices, numelements, GL_UNSIGNED_INT, bufferobject ? (void *)bufferoffset : elements);
-                       CHECKGLERROR
+                       GL_BindEBO(bufferobject3s);
+                       if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
+                       {
+                               qglDrawRangeElements(GL_TRIANGLES, firstvertex, firstvertex + numvertices - 1, numelements, GL_UNSIGNED_SHORT, (void *)(firsttriangle * sizeof(unsigned short[3])));
+                               CHECKGLERROR
+                       }
+                       else
+                       {
+                               qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_SHORT, (void *)(firsttriangle * sizeof(unsigned short[3])));
+                               CHECKGLERROR
+                       }
                }
-               else
+               else if (bufferobject3i)
                {
-                       GL_BindEBO(bufferobject);
-                       qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, bufferobject ? (void *)bufferoffset : elements);
-                       CHECKGLERROR
+                       GL_BindEBO(bufferobject3i);
+                       if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
+                       {
+                               qglDrawRangeElements(GL_TRIANGLES, firstvertex, firstvertex + numvertices - 1, numelements, GL_UNSIGNED_INT, (void *)(firsttriangle * sizeof(unsigned int[3])));
+                               CHECKGLERROR
+                       }
+                       else
+                       {
+                               qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, (void *)(firsttriangle * sizeof(unsigned int[3])));
+                               CHECKGLERROR
+                       }
+               }
+               else if (element3s)
+               {
+                       GL_BindEBO(0);
+                       if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
+                       {
+                               qglDrawRangeElements(GL_TRIANGLES, firstvertex, firstvertex + numvertices - 1, numelements, GL_UNSIGNED_SHORT, element3s);
+                               CHECKGLERROR
+                       }
+                       else
+                       {
+                               qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_SHORT, element3s);
+                               CHECKGLERROR
+                       }
+               }
+               else if (element3i)
+               {
+                       GL_BindEBO(0);
+                       if (gl_mesh_drawrangeelements.integer && qglDrawRangeElements != NULL)
+                       {
+                               qglDrawRangeElements(GL_TRIANGLES, firstvertex, firstvertex + numvertices - 1, numelements, GL_UNSIGNED_INT, element3i);
+                               CHECKGLERROR
+                       }
+                       else
+                       {
+                               qglDrawElements(GL_TRIANGLES, numelements, GL_UNSIGNED_INT, element3i);
+                               CHECKGLERROR
+                       }
                }
        }
 }
@@ -1081,32 +1397,74 @@ void R_Mesh_Finish(void)
        qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);CHECKGLERROR
 }
 
-int R_Mesh_CreateStaticEBO(void *data, size_t size)
+int R_Mesh_CreateStaticBufferObject(unsigned int target, void *data, size_t size, const char *name)
 {
+       gl_bufferobjectinfo_t *info;
        GLuint bufferobject;
+
+       if (!gl_vbo.integer)
+               return 0;
+
        qglGenBuffersARB(1, &bufferobject);
-       GL_BindEBO(bufferobject);
-       qglBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, size, data, GL_STATIC_DRAW_ARB);
+       switch(target)
+       {
+       case GL_ELEMENT_ARRAY_BUFFER_ARB: GL_BindEBO(bufferobject);break;
+       case GL_ARRAY_BUFFER_ARB: GL_BindVBO(bufferobject);break;
+       default: Sys_Error("R_Mesh_CreateStaticBufferObject: unknown target type %i\n", target);return 0;
+       }
+       qglBufferDataARB(target, size, data, GL_STATIC_DRAW_ARB);
+
+       info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_AllocRecord(&gl_bufferobjectinfoarray);
+       memset(info, 0, sizeof(*info));
+       info->target = target;
+       info->object = bufferobject;
+       info->size = size;
+       strlcpy(info->name, name, sizeof(info->name));
+
        return (int)bufferobject;
 }
 
-void R_Mesh_DestroyEBO(int bufferobject)
+void R_Mesh_DestroyBufferObject(int bufferobject)
 {
+       int i, endindex;
+       gl_bufferobjectinfo_t *info;
+
        qglDeleteBuffersARB(1, (GLuint *)&bufferobject);
-}
 
-int R_Mesh_CreateStaticVBO(void *data, size_t size)
-{
-       GLuint bufferobject;
-       qglGenBuffersARB(1, &bufferobject);
-       GL_BindVBO(bufferobject);
-       qglBufferDataARB(GL_ARRAY_BUFFER_ARB, size, data, GL_STATIC_DRAW_ARB);
-       return (int)bufferobject;
+       endindex = Mem_ExpandableArray_IndexRange(&gl_bufferobjectinfoarray);
+       for (i = 0;i < endindex;i++)
+       {
+               info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_bufferobjectinfoarray, i);
+               if (!info)
+                       continue;
+               if (info->object == bufferobject)
+               {
+                       Mem_ExpandableArray_FreeRecord(&gl_bufferobjectinfoarray, (void *)info);
+                       break;
+               }
+       }
 }
 
-void R_Mesh_DestroyVBO(int bufferobject)
+void GL_Mesh_ListVBOs(qboolean printeach)
 {
-       qglDeleteBuffersARB(1, (GLuint *)&bufferobject);
+       int i, endindex;
+       size_t ebocount = 0, ebomemory = 0;
+       size_t vbocount = 0, vbomemory = 0;
+       gl_bufferobjectinfo_t *info;
+       endindex = Mem_ExpandableArray_IndexRange(&gl_bufferobjectinfoarray);
+       for (i = 0;i < endindex;i++)
+       {
+               info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_bufferobjectinfoarray, i);
+               if (!info)
+                       continue;
+               switch(info->target)
+               {
+               case GL_ELEMENT_ARRAY_BUFFER_ARB: ebocount++;ebomemory += info->size;if (printeach) Con_Printf("EBO #%i %s = %i bytes\n", info->object, info->name, (int)info->size);break;
+               case GL_ARRAY_BUFFER_ARB: vbocount++;vbomemory += info->size;if (printeach) Con_Printf("VBO #%i %s = %i bytes\n", info->object, info->name, (int)info->size);break;
+               default: Con_Printf("gl_vbostats: unknown target type %i\n", info->target);break;
+               }
+       }
+       Con_Printf("vertex buffers: %i element buffers totalling %i bytes (%.3f MB), %i vertex buffers totalling %i bytes (%.3f MB), combined %i bytes (%.3fMB)\n", (int)ebocount, (int)ebomemory, ebomemory / 1048576.0, (int)vbocount, (int)vbomemory, vbomemory / 1048576.0, (int)(ebomemory + vbomemory), (ebomemory + vbomemory) / 1048576.0);
 }
 
 void R_Mesh_Matrix(const matrix4x4_t *matrix)
@@ -1124,6 +1482,8 @@ void R_Mesh_Matrix(const matrix4x4_t *matrix)
 
 void R_Mesh_VertexPointer(const float *vertex3f, int bufferobject, size_t bufferoffset)
 {
+       if (!gl_vbo.integer)
+               bufferobject = 0;
        if (gl_state.pointer_vertex != vertex3f || gl_state.pointer_vertex_buffer != bufferobject || gl_state.pointer_vertex_offset != bufferoffset)
        {
                gl_state.pointer_vertex = vertex3f;
@@ -1137,8 +1497,13 @@ void R_Mesh_VertexPointer(const float *vertex3f, int bufferobject, size_t buffer
 
 void R_Mesh_ColorPointer(const float *color4f, int bufferobject, size_t bufferoffset)
 {
-       if (color4f || bufferobject)
+       // note: this can not rely on bufferobject to decide whether a color array
+       // is supplied, because surfmesh_t shares one vbo for all arrays, which
+       // means that a valid vbo may be supplied even if there is no color array.
+       if (color4f)
        {
+               if (!gl_vbo.integer)
+                       bufferobject = 0;
                // caller wants color array enabled
                if (!gl_state.pointer_color_enabled)
                {
@@ -1175,8 +1540,12 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co
        gltextureunit_t *unit = gl_state.units + unitnum;
        // update array settings
        CHECKGLERROR
-       if (texcoord || bufferobject)
+       // note: there is no need to check bufferobject here because all cases
+       // that involve a valid bufferobject also supply a texcoord array
+       if (texcoord)
        {
+               if (!gl_vbo.integer)
+                       bufferobject = 0;
                // texture array unit is enabled, enable the array
                if (!unit->arrayenabled)
                {
@@ -1603,6 +1972,8 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum)
        }
 }
 
+static const double gl_identitymatrix[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1};
+
 void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
 {
        gltextureunit_t *unit = gl_state.units + unitnum;
@@ -1616,8 +1987,8 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
                        unit->matrix = *matrix;
                        CHECKGLERROR
                        Matrix4x4_ToArrayDoubleGL(&unit->matrix, glmatrix);
-                       qglMatrixMode(GL_TEXTURE);CHECKGLERROR
                        GL_ActiveTexture(unitnum);
+                       qglMatrixMode(GL_TEXTURE);CHECKGLERROR
                        qglLoadMatrixd(glmatrix);CHECKGLERROR
                        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
                }
@@ -1628,9 +1999,10 @@ void R_Mesh_TexMatrix(unsigned int unitnum, const matrix4x4_t *matrix)
                if (unit->texmatrixenabled)
                {
                        unit->texmatrixenabled = false;
+                       unit->matrix = identitymatrix;
                        CHECKGLERROR
-                       qglMatrixMode(GL_TEXTURE);CHECKGLERROR
                        GL_ActiveTexture(unitnum);
+                       qglMatrixMode(GL_TEXTURE);CHECKGLERROR
                        qglLoadIdentity();CHECKGLERROR
                        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
                }
@@ -1708,9 +2080,9 @@ void R_Mesh_TextureState(const rmeshstate_t *m)
        for (i = 0;i < backendarrayunits;i++)
        {
                if (m->pointer_texcoord3f[i])
-                       R_Mesh_TexCoordPointer(i, 3, m->pointer_texcoord3f[i], 0, 0);
+                       R_Mesh_TexCoordPointer(i, 3, m->pointer_texcoord3f[i], m->pointer_texcoord_bufferobject[i], m->pointer_texcoord_bufferoffset[i]);
                else
-                       R_Mesh_TexCoordPointer(i, 2, m->pointer_texcoord[i], 0, 0);
+                       R_Mesh_TexCoordPointer(i, 2, m->pointer_texcoord[i], m->pointer_texcoord_bufferobject[i], m->pointer_texcoord_bufferoffset[i]);
        }
        for (i = 0;i < backendunits;i++)
        {
@@ -1800,9 +2172,10 @@ void R_Mesh_ResetTextureState(void)
                if (unit->texmatrixenabled)
                {
                        unit->texmatrixenabled = false;
+                       unit->matrix = identitymatrix;
                        CHECKGLERROR
-                       qglMatrixMode(GL_TEXTURE);CHECKGLERROR
                        GL_ActiveTexture(unitnum);
+                       qglMatrixMode(GL_TEXTURE);CHECKGLERROR
                        qglLoadIdentity();CHECKGLERROR
                        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
                }
@@ -1844,17 +2217,3 @@ void R_Mesh_ResetTextureState(void)
                }
        }
 }
-
-void R_Mesh_Draw_ShowTris(int firstvertex, int numvertices, int numtriangles, const int *elements)
-{
-       CHECKGLERROR
-       qglBegin(GL_LINES);
-       for (;numtriangles;numtriangles--, elements += 3)
-       {
-               qglArrayElement(elements[0]);qglArrayElement(elements[1]);
-               qglArrayElement(elements[1]);qglArrayElement(elements[2]);
-               qglArrayElement(elements[2]);qglArrayElement(elements[0]);
-       }
-       qglEnd();
-       CHECKGLERROR
-}