]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - gl_backend.c
movement packet loss tracking
[xonotic/darkplaces.git] / gl_backend.c
index 955ac372631ca3b989dc8dae99e5f6e25480bd3d..2b33d81c780b17ecaab168ac478344fa9d7b48d7 100644 (file)
@@ -79,15 +79,78 @@ void GL_PrintError(int errornumber, char *filename, int linenumber)
 }
 #endif
 
-#define BACKENDACTIVECHECK if (!backendactive) Sys_Error("GL backend function called when backend is not active");
+#define BACKENDACTIVECHECK if (!gl_state.active) Sys_Error("GL backend function called when backend is not active");
 
 void SCR_ScreenShot_f (void);
 
-static r_viewport_t backend_viewport;
-static matrix4x4_t backend_modelmatrix;
-static matrix4x4_t backend_modelviewmatrix;
+typedef struct gl_bufferobjectinfo_s
+{
+       int target;
+       int object;
+       size_t size;
+       char name[MAX_QPATH];
+}
+gl_bufferobjectinfo_t;
+
+typedef struct gltextureunit_s
+{
+       const void *pointer_texcoord;
+       size_t pointer_texcoord_offset;
+       int pointer_texcoord_buffer;
+       int t2d, t3d, tcubemap, trectangle;
+       int arrayenabled;
+       unsigned int arraycomponents;
+       int rgbscale, alphascale;
+       int combine;
+       int combinergb, combinealpha;
+       // texmatrixenabled exists only to avoid unnecessary texmatrix compares
+       int texmatrixenabled;
+       matrix4x4_t matrix;
+}
+gltextureunit_t;
+
+typedef struct gl_state_s
+{
+       int cullface;
+       int cullfaceenable;
+       int blendfunc1;
+       int blendfunc2;
+       int blend;
+       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;
+       unsigned int clientunit;
+       gltextureunit_t units[MAX_TEXTUREUNITS];
+       float color4f[4];
+       int lockrange_first;
+       int lockrange_count;
+       int vertexbufferobject;
+       int elementbufferobject;
+       qboolean pointer_color_enabled;
+       const void *pointer_vertex;
+       const void *pointer_color;
+       size_t pointer_vertex_offset;
+       size_t pointer_color_offset;
+       int pointer_vertex_buffer;
+       int pointer_color_buffer;
+
+       memexpandablearray_t bufferobjectinfoarray;
+
+       r_viewport_t viewport;
+       matrix4x4_t modelmatrix;
+       matrix4x4_t modelviewmatrix;
+
+       qboolean active;
+}
+gl_state_t;
+
+static gl_state_t gl_state;
 
-static unsigned int backendunits, backendimageunits, backendarrayunits, backendactive;
 
 /*
 note: here's strip order for a terrain row:
@@ -148,84 +211,33 @@ unsigned short polygonelement3s[(POLYGONELEMENTS_MAXPOINTS-2)*3];
 int quadelement3i[QUADELEMENTS_MAXQUADS*6];
 unsigned short quadelement3s[QUADELEMENTS_MAXQUADS*6];
 
-void GL_Backend_AllocArrays(void)
-{
-}
-
-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_ResetState(void);
 
 static void gl_backend_start(void)
 {
-       CHECKGLERROR
-
-       if (qglDrawRangeElements != NULL)
-       {
-               CHECKGLERROR
-               qglGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &gl_maxdrawrangeelementsvertices);
-               CHECKGLERROR
-               qglGetIntegerv(GL_MAX_ELEMENTS_INDICES, &gl_maxdrawrangeelementsindices);
-               CHECKGLERROR
-               Con_DPrintf("GL_MAX_ELEMENTS_VERTICES = %i\nGL_MAX_ELEMENTS_INDICES = %i\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices);
-       }
-
-       backendunits = bound(1, gl_textureunits, MAX_TEXTUREUNITS);
-       backendimageunits = backendunits;
-       backendarrayunits = backendunits;
-       if (gl_support_fragment_shader)
-       {
-               CHECKGLERROR
-               qglGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, (int *)&backendimageunits);
-               CHECKGLERROR
-               qglGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, (int *)&backendarrayunits);
-               CHECKGLERROR
-               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
-               Con_DPrintf("GL_MAX_TEXTUREUNITS = %i\n", backendunits);
-
-       GL_Backend_AllocArrays();
+       memset(&gl_state, 0, sizeof(gl_state));
 
-       Mem_ExpandableArray_NewArray(&gl_bufferobjectinfoarray, r_main_mempool, sizeof(gl_bufferobjectinfo_t), 128);
+       Mem_ExpandableArray_NewArray(&gl_state.bufferobjectinfoarray, r_main_mempool, sizeof(gl_bufferobjectinfo_t), 128);
 
        Con_DPrintf("OpenGL backend started.\n");
 
        CHECKGLERROR
 
-       backendactive = true;
+       GL_Backend_ResetState();
 }
 
 static void gl_backend_shutdown(void)
 {
-       backendunits = 0;
-       backendimageunits = 0;
-       backendarrayunits = 0;
-       backendactive = false;
-
        Con_DPrint("OpenGL Backend shutting down\n");
 
-       Mem_ExpandableArray_FreeArray(&gl_bufferobjectinfoarray);
+       Mem_ExpandableArray_FreeArray(&gl_state.bufferobjectinfoarray);
 
-       GL_Backend_FreeArrays();
+       memset(&gl_state, 0, sizeof(gl_state));
 }
 
 static void gl_backend_newmap(void)
@@ -294,10 +306,10 @@ void R_Viewport_TransformToScreen(const r_viewport_t *v, const vec4_t in, vec4_t
        out[2] = v->z + (out[2] * iw + 1.0f) * v->depth * 0.5f;
 }
 
-static void R_Viewport_ApplyNearClipPlane(r_viewport_t *v, double normalx, double normaly, double normalz, double dist)
+static void R_Viewport_ApplyNearClipPlane(r_viewport_t *v, float normalx, float normaly, float normalz, float dist)
 {
-       double q[4];
-       double d;
+       float q[4];
+       float d;
        float clipPlane[4], v3[3], v4[3];
        float normal[3];
 
@@ -342,7 +354,7 @@ static void R_Viewport_ApplyNearClipPlane(r_viewport_t *v, double normalx, doubl
        v->m[14] = clipPlane[3] * d;
 }
 
-void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, double x1, double y1, double x2, double y2, double nearclip, double farclip, const double *nearplane)
+void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, float x1, float y1, float x2, float y2, float nearclip, float farclip, const float *nearplane)
 {
        float left = x1, right = x2, bottom = y2, top = y1, zNear = nearclip, zFar = farclip;
        memset(v, 0, sizeof(*v));
@@ -361,9 +373,11 @@ void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int
        v->m[13] = - (top + bottom)/(top - bottom);
        v->m[14] = - (zFar + zNear)/(zFar - zNear);
        v->m[15] = 1;
+       v->screentodepth[0] = -farclip / (farclip - nearclip);
+       v->screentodepth[1] = farclip * nearclip / (farclip - nearclip);
 
        Matrix4x4_Invert_Full(&v->viewmatrix, &v->cameramatrix);
-       Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m);
+       Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m);
 
        if (nearplane)
                R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]);
@@ -379,7 +393,7 @@ void R_Viewport_InitOrtho(r_viewport_t *v, const matrix4x4_t *cameramatrix, int
 #endif
 }
 
-void R_Viewport_InitPerspective(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, double frustumx, double frustumy, double nearclip, double farclip, const double *nearplane)
+void R_Viewport_InitPerspective(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, float frustumx, float frustumy, float nearclip, float farclip, const float *nearplane)
 {
        matrix4x4_t tempmatrix, basematrix;
        memset(v, 0, sizeof(*v));
@@ -400,22 +414,24 @@ void R_Viewport_InitPerspective(r_viewport_t *v, const matrix4x4_t *cameramatrix
        v->m[10] = -(farclip + nearclip) / (farclip - nearclip);
        v->m[11] = -1;
        v->m[14] = -2 * nearclip * farclip / (farclip - nearclip);
+       v->screentodepth[0] = -farclip / (farclip - nearclip);
+       v->screentodepth[1] = farclip * nearclip / (farclip - nearclip);
 
        Matrix4x4_Invert_Full(&tempmatrix, &v->cameramatrix);
        Matrix4x4_CreateRotate(&basematrix, -90, 1, 0, 0);
        Matrix4x4_ConcatRotate(&basematrix, 90, 0, 0, 1);
        Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix);
 
-       Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m);
+       Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m);
 
        if (nearplane)
                R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]);
 }
 
-void R_Viewport_InitPerspectiveInfinite(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, double frustumx, double frustumy, double nearclip, const double *nearplane)
+void R_Viewport_InitPerspectiveInfinite(r_viewport_t *v, const matrix4x4_t *cameramatrix, int x, int y, int width, int height, float frustumx, float frustumy, float nearclip, const float *nearplane)
 {
        matrix4x4_t tempmatrix, basematrix;
-       const double nudge = 1.0 - 1.0 / (1<<23);
+       const float nudge = 1.0 - 1.0 / (1<<23);
        memset(v, 0, sizeof(*v));
 
        if(v_flipped.integer)
@@ -434,13 +450,15 @@ void R_Viewport_InitPerspectiveInfinite(r_viewport_t *v, const matrix4x4_t *came
        v->m[10] = -nudge;
        v->m[11] = -1;
        v->m[14] = -2 * nearclip * nudge;
+       v->screentodepth[0] = (v->m[10] + 1) * 0.5 - 1;
+       v->screentodepth[1] = v->m[14] * -0.5;
 
        Matrix4x4_Invert_Full(&tempmatrix, &v->cameramatrix);
        Matrix4x4_CreateRotate(&basematrix, -90, 1, 0, 0);
        Matrix4x4_ConcatRotate(&basematrix, 90, 0, 0, 1);
        Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix);
 
-       Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m);
+       Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m);
 
        if (nearplane)
                R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]);
@@ -544,7 +562,7 @@ void R_Viewport_InitCubeSideView(r_viewport_t *v, const matrix4x4_t *cameramatri
        Matrix4x4_FromArrayFloatGL(&basematrix, cubeviewmatrix[side]);
        Matrix4x4_Invert_Simple(&tempmatrix, &v->cameramatrix);
        Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix);
-       Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m);
+       Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m);
 
        if (nearplane)
                R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]);
@@ -569,7 +587,7 @@ void R_Viewport_InitRectSideView(r_viewport_t *v, const matrix4x4_t *cameramatri
        Matrix4x4_FromArrayFloatGL(&basematrix, rectviewmatrix[side]);
        Matrix4x4_Invert_Simple(&tempmatrix, &v->cameramatrix);
        Matrix4x4_Concat(&v->viewmatrix, &basematrix, &tempmatrix);
-       Matrix4x4_FromArrayDoubleGL(&v->projectmatrix, v->m);
+       Matrix4x4_FromArrayFloatGL(&v->projectmatrix, v->m);
 
        if (nearplane)
                R_Viewport_ApplyNearClipPlane(v, nearplane[0], nearplane[1], nearplane[2], nearplane[3]);
@@ -578,78 +596,29 @@ void R_Viewport_InitRectSideView(r_viewport_t *v, const matrix4x4_t *cameramatri
 void R_SetViewport(const r_viewport_t *v)
 {
        float glmatrix[16];
-       backend_viewport = *v;
+       gl_state.viewport = *v;
 
        CHECKGLERROR
        qglViewport(v->x, v->y, v->width, v->height);CHECKGLERROR
 
        // Load the projection matrix into OpenGL
        qglMatrixMode(GL_PROJECTION);CHECKGLERROR
-       qglLoadMatrixd(backend_viewport.m);CHECKGLERROR
+       qglLoadMatrixf(gl_state.viewport.m);CHECKGLERROR
        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
 
        // FIXME: v_flipped_state is evil, this probably breaks somewhere
        GL_SetMirrorState(v_flipped.integer && (v->type == R_VIEWPORTTYPE_PERSPECTIVE || v->type == R_VIEWPORTTYPE_PERSPECTIVE_INFINITEFARCLIP));
 
        // directly force an update of the modelview matrix
-       Matrix4x4_Concat(&backend_modelviewmatrix, &backend_viewport.viewmatrix, &backend_modelmatrix);
-       Matrix4x4_ToArrayFloatGL(&backend_modelviewmatrix, glmatrix);
+       Matrix4x4_Concat(&gl_state.modelviewmatrix, &gl_state.viewport.viewmatrix, &gl_state.modelmatrix);
+       Matrix4x4_ToArrayFloatGL(&gl_state.modelviewmatrix, glmatrix);
        qglLoadMatrixf(glmatrix);CHECKGLERROR
 }
 
 void R_GetViewport(r_viewport_t *v)
 {
-       *v = backend_viewport;
-}
-
-typedef struct gltextureunit_s
-{
-       const void *pointer_texcoord;
-       size_t pointer_texcoord_offset;
-       int pointer_texcoord_buffer;
-       int t1d, t2d, t3d, tcubemap, trectangle;
-       int arrayenabled;
-       unsigned int arraycomponents;
-       int rgbscale, alphascale;
-       int combinergb, combinealpha;
-       // FIXME: add more combine stuff
-       // texmatrixenabled exists only to avoid unnecessary texmatrix compares
-       int texmatrixenabled;
-       matrix4x4_t matrix;
-}
-gltextureunit_t;
-
-static struct gl_state_s
-{
-       int cullface;
-       int cullfaceenable;
-       int blendfunc1;
-       int blendfunc2;
-       int blend;
-       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;
-       unsigned int clientunit;
-       gltextureunit_t units[MAX_TEXTUREUNITS];
-       float color4f[4];
-       int lockrange_first;
-       int lockrange_count;
-       int vertexbufferobject;
-       int elementbufferobject;
-       qboolean pointer_color_enabled;
-       const void *pointer_vertex;
-       const void *pointer_color;
-       size_t pointer_vertex_offset;
-       size_t pointer_color_offset;
-       int pointer_vertex_buffer;
-       int pointer_color_buffer;
+       *v = gl_state.viewport;
 }
-gl_state;
 
 static void GL_BindVBO(int bufferobject)
 {
@@ -673,112 +642,10 @@ static void GL_BindEBO(int bufferobject)
        }
 }
 
-void GL_SetupTextureState(void)
+static void GL_Backend_ResetState(void)
 {
        unsigned int i;
-       gltextureunit_t *unit;
-       CHECKGLERROR
-       gl_state.unit = MAX_TEXTUREUNITS;
-       gl_state.clientunit = MAX_TEXTUREUNITS;
-       for (i = 0;i < MAX_TEXTUREUNITS;i++)
-       {
-               unit = gl_state.units + i;
-               unit->t1d = 0;
-               unit->t2d = 0;
-               unit->t3d = 0;
-               unit->tcubemap = 0;
-               unit->arrayenabled = false;
-               unit->arraycomponents = 0;
-               unit->pointer_texcoord = NULL;
-               unit->pointer_texcoord_buffer = 0;
-               unit->pointer_texcoord_offset = 0;
-               unit->rgbscale = 1;
-               unit->alphascale = 1;
-               unit->combinergb = GL_MODULATE;
-               unit->combinealpha = GL_MODULATE;
-               unit->texmatrixenabled = false;
-               unit->matrix = identitymatrix;
-       }
-
-       for (i = 0;i < backendimageunits;i++)
-       {
-               GL_ActiveTexture(i);
-               qglBindTexture(GL_TEXTURE_1D, 0);CHECKGLERROR
-               qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR
-               if (gl_texture3d)
-               {
-                       qglBindTexture(GL_TEXTURE_3D, 0);CHECKGLERROR
-               }
-               if (gl_texturecubemap)
-               {
-                       qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);CHECKGLERROR
-               }
-               if (gl_texturerectangle)
-               {
-                       qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);CHECKGLERROR
-               }
-       }
-
-       for (i = 0;i < backendarrayunits;i++)
-       {
-               GL_ClientActiveTexture(i);
-               GL_BindVBO(0);
-               qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), NULL);CHECKGLERROR
-               qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
-       }
-
-       for (i = 0;i < backendunits;i++)
-       {
-               GL_ActiveTexture(i);
-               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
-               if (gl_texture3d)
-               {
-                       qglDisable(GL_TEXTURE_3D);CHECKGLERROR
-               }
-               if (gl_texturecubemap)
-               {
-                       qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-               }
-               if (gl_texturerectangle)
-               {
-                       qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
-               }
-               qglMatrixMode(GL_TEXTURE);CHECKGLERROR
-               qglLoadIdentity();CHECKGLERROR
-               qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
-               if (gl_combine.integer)
-               {
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, GL_MODULATE);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB, GL_TEXTURE);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_ARB, GL_PREVIOUS_ARB);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_ARB, GL_TEXTURE);CHECKGLERROR // for GL_INTERPOLATE_ARB mode
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB, GL_SRC_COLOR);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_RGB_ARB, GL_SRC_COLOR);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_RGB_ARB, GL_SRC_ALPHA);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, GL_MODULATE);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB, GL_TEXTURE);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB, GL_PREVIOUS_ARB);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_ALPHA_ARB, GL_CONSTANT_ARB);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_OPERAND2_ALPHA_ARB, GL_SRC_ALPHA);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1);CHECKGLERROR
-               }
-               else
-               {
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR
-               }
-               CHECKGLERROR
-       }
-       CHECKGLERROR
-}
-
-void GL_Backend_ResetState(void)
-{
-       memset(&gl_state, 0, sizeof(gl_state));
+       gl_state.active = true;
        gl_state.depthtest = true;
        gl_state.alphatest = false;
        gl_state.blendfunc1 = GL_ONE;
@@ -808,13 +675,13 @@ void GL_Backend_ResetState(void)
        qglDepthMask(gl_state.depthmask);CHECKGLERROR
        qglPolygonOffset(gl_state.polygonoffset[0], gl_state.polygonoffset[1]);
 
-       if (gl_support_arb_vertex_buffer_object)
+       if (vid.support.arb_vertex_buffer_object)
        {
                qglBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
                qglBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
        }
 
-       if (gl_support_ext_framebuffer_object)
+       if (vid.support.ext_framebuffer_object)
        {
                qglBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
                qglBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@@ -829,7 +696,57 @@ void GL_Backend_ResetState(void)
        GL_Color(0, 0, 0, 0);
        GL_Color(1, 1, 1, 1);
 
-       GL_SetupTextureState();
+       gl_state.unit = MAX_TEXTUREUNITS;
+       gl_state.clientunit = MAX_TEXTUREUNITS;
+       for (i = 0;i < vid.teximageunits;i++)
+       {
+               GL_ActiveTexture(i);
+               qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR
+               if (vid.support.ext_texture_3d)
+               {
+                       qglBindTexture(GL_TEXTURE_3D, 0);CHECKGLERROR
+               }
+               if (vid.support.arb_texture_cube_map)
+               {
+                       qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);CHECKGLERROR
+               }
+               if (vid.support.arb_texture_rectangle)
+               {
+                       qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);CHECKGLERROR
+               }
+       }
+
+       for (i = 0;i < vid.texarrayunits;i++)
+       {
+               GL_ClientActiveTexture(i);
+               GL_BindVBO(0);
+               qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), NULL);CHECKGLERROR
+               qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
+       }
+
+       for (i = 0;i < vid.texunits;i++)
+       {
+               GL_ActiveTexture(i);
+               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
+               if (vid.support.ext_texture_3d)
+               {
+                       qglDisable(GL_TEXTURE_3D);CHECKGLERROR
+               }
+               if (vid.support.arb_texture_cube_map)
+               {
+                       qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
+               }
+               if (vid.support.arb_texture_rectangle)
+               {
+                       qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
+               }
+               qglMatrixMode(GL_TEXTURE);CHECKGLERROR
+               qglLoadIdentity();CHECKGLERROR
+               qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+               qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR
+               CHECKGLERROR
+       }
+       CHECKGLERROR
 }
 
 void GL_ActiveTexture(unsigned int num)
@@ -1048,7 +965,7 @@ void GL_LockArrays(int first, int count)
                        qglUnlockArraysEXT();
                        CHECKGLERROR
                }
-               if (count && gl_supportslockarrays && gl_lockarrays.integer)
+               if (count && vid.support.ext_compiled_vertex_array && gl_lockarrays.integer)
                {
                        gl_state.lockrange_first = first;
                        gl_state.lockrange_count = count;
@@ -1095,7 +1012,6 @@ void R_Mesh_Start(void)
                Con_Printf("WARNING: gl_printcheckerror is on but gl_paranoid is off, turning it on...\n");
                Cvar_SetValueQuick(&gl_paranoid, 1);
        }
-       GL_Backend_ResetState();
 }
 
 qboolean GL_Backend_CompileShader(int programobject, GLenum shadertypeenum, const char *shadertype, int numstrings, const char **strings)
@@ -1110,7 +1026,7 @@ 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] && developer.integer > 0)
+       if (compilelog[0] && developer.integer > 0 && (strstr(compilelog, "error") || strstr(compilelog, "ERROR") || strstr(compilelog, "Error") || strstr(compilelog, "WARNING") || strstr(compilelog, "warning") || strstr(compilelog, "Warning")))
        {
                int i, j, pretextlines = 0;
                for (i = 0;i < numstrings - 1;i++)
@@ -1156,7 +1072,8 @@ unsigned int GL_Backend_CompileProgram(int vertexstrings_count, const char **ver
        qglGetInfoLogARB(programobject, sizeof(linklog), NULL, linklog);CHECKGLERROR
        if (linklog[0])
        {
-               Con_DPrintf("program link log:\n%s\n", linklog);
+               if (strstr(linklog, "error") || strstr(linklog, "ERROR") || strstr(linklog, "Error") || strstr(linklog, "WARNING") || strstr(linklog, "warning") || strstr(linklog, "Warning"))
+                       Con_DPrintf("program link log:\n%s\n", linklog);
                // software vertex shader is ok but software fragment shader is WAY
                // too slow, fail program if so.
                // NOTE: this string might be ATI specific, but that's ok because the
@@ -1181,8 +1098,6 @@ void GL_Backend_FreeProgram(unsigned int prog)
        CHECKGLERROR
 }
 
-int gl_backend_rebindtextures;
-
 void GL_Backend_RenumberElements(int *out, int count, const int *in, int offset)
 {
        int i;
@@ -1258,7 +1173,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri
                                for (j = 0, size = numvertices * 4, p = (int *)((float *)gl_state.pointer_color + firstvertex * 4);j < size;j++, p++)
                                        paranoidblah += *p;
                }
-               for (i = 0;i < backendarrayunits;i++)
+               for (i = 0;i < vid.texarrayunits;i++)
                {
                        if (gl_state.units[i].arrayenabled)
                        {
@@ -1306,11 +1221,11 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri
                        for (i = 0;i < (unsigned int) numtriangles * 3;i++)
                        {
                                element = element3i ? element3i[i] : element3s[i];
-                               for (j = 0;j < backendarrayunits;j++)
+                               for (j = 0;j < vid.texarrayunits;j++)
                                {
                                        if (gl_state.units[j].pointer_texcoord && gl_state.units[j].arrayenabled)
                                        {
-                                               if (backendarrayunits > 1)
+                                               if (vid.texarrayunits > 1)
                                                {
                                                        if (gl_state.units[j].arraycomponents == 4)
                                                        {
@@ -1448,78 +1363,18 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri
 // restores backend state, used when done with 3D rendering
 void R_Mesh_Finish(void)
 {
-       unsigned int i;
-       BACKENDACTIVECHECK
-       CHECKGLERROR
-       GL_LockArrays(0, 0);
-       CHECKGLERROR
+}
+
+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;
 
-       for (i = 0;i < backendimageunits;i++)
-       {
-               GL_ActiveTexture(i);
-               qglBindTexture(GL_TEXTURE_1D, 0);CHECKGLERROR
-               qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR
-               if (gl_texture3d)
-               {
-                       qglBindTexture(GL_TEXTURE_3D, 0);CHECKGLERROR
-               }
-               if (gl_texturecubemap)
-               {
-                       qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);CHECKGLERROR
-               }
-               if (gl_texturerectangle)
-               {
-                       qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);CHECKGLERROR
-               }
-       }
-       for (i = 0;i < backendarrayunits;i++)
-       {
-               GL_ActiveTexture(backendarrayunits - 1 - i);
-               qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
-       }
-       for (i = 0;i < backendunits;i++)
-       {
-               GL_ActiveTexture(backendunits - 1 - i);
-               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
-               if (gl_texture3d)
-               {
-                       qglDisable(GL_TEXTURE_3D);CHECKGLERROR
-               }
-               if (gl_texturecubemap)
-               {
-                       qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-               }
-               if (gl_texturerectangle)
-               {
-                       qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
-               }
-               qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);CHECKGLERROR
-               if (gl_combine.integer)
-               {
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, 1);CHECKGLERROR
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, 1);CHECKGLERROR
-               }
-       }
-       qglDisableClientState(GL_COLOR_ARRAY);CHECKGLERROR
-       qglDisableClientState(GL_VERTEX_ARRAY);CHECKGLERROR
-
-       qglDisable(GL_BLEND);CHECKGLERROR
-       qglEnable(GL_DEPTH_TEST);CHECKGLERROR
-       qglDepthMask(GL_TRUE);CHECKGLERROR
-       qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);CHECKGLERROR
-}
-
-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);
-       switch(target)
+       qglGenBuffersARB(1, &bufferobject);
+       switch(target)
        {
        case GL_ELEMENT_ARRAY_BUFFER_ARB: GL_BindEBO(bufferobject);break;
        case GL_ARRAY_BUFFER_ARB: GL_BindVBO(bufferobject);break;
@@ -1527,7 +1382,7 @@ int R_Mesh_CreateStaticBufferObject(unsigned int target, void *data, size_t size
        }
        qglBufferDataARB(target, size, data, GL_STATIC_DRAW_ARB);
 
-       info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_AllocRecord(&gl_bufferobjectinfoarray);
+       info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_AllocRecord(&gl_state.bufferobjectinfoarray);
        memset(info, 0, sizeof(*info));
        info->target = target;
        info->object = bufferobject;
@@ -1544,15 +1399,15 @@ void R_Mesh_DestroyBufferObject(int bufferobject)
 
        qglDeleteBuffersARB(1, (GLuint *)&bufferobject);
 
-       endindex = Mem_ExpandableArray_IndexRange(&gl_bufferobjectinfoarray);
+       endindex = Mem_ExpandableArray_IndexRange(&gl_state.bufferobjectinfoarray);
        for (i = 0;i < endindex;i++)
        {
-               info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_bufferobjectinfoarray, i);
+               info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_state.bufferobjectinfoarray, i);
                if (!info)
                        continue;
                if (info->object == bufferobject)
                {
-                       Mem_ExpandableArray_FreeRecord(&gl_bufferobjectinfoarray, (void *)info);
+                       Mem_ExpandableArray_FreeRecord(&gl_state.bufferobjectinfoarray, (void *)info);
                        break;
                }
        }
@@ -1564,10 +1419,10 @@ void GL_Mesh_ListVBOs(qboolean printeach)
        size_t ebocount = 0, ebomemory = 0;
        size_t vbocount = 0, vbomemory = 0;
        gl_bufferobjectinfo_t *info;
-       endindex = Mem_ExpandableArray_IndexRange(&gl_bufferobjectinfoarray);
+       endindex = Mem_ExpandableArray_IndexRange(&gl_state.bufferobjectinfoarray);
        for (i = 0;i < endindex;i++)
        {
-               info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_bufferobjectinfoarray, i);
+               info = (gl_bufferobjectinfo_t *) Mem_ExpandableArray_RecordAtIndex(&gl_state.bufferobjectinfoarray, i);
                if (!info)
                        continue;
                switch(info->target)
@@ -1582,12 +1437,12 @@ void GL_Mesh_ListVBOs(qboolean printeach)
 
 void R_Mesh_Matrix(const matrix4x4_t *matrix)
 {
-       if (memcmp(matrix, &backend_modelmatrix, sizeof(matrix4x4_t)))
+       if (memcmp(matrix, &gl_state.modelmatrix, sizeof(matrix4x4_t)))
        {
                float glmatrix[16];
-               backend_modelmatrix = *matrix;
-               Matrix4x4_Concat(&backend_modelviewmatrix, &backend_viewport.viewmatrix, &backend_modelmatrix);
-               Matrix4x4_ToArrayFloatGL(&backend_modelviewmatrix, glmatrix);
+               gl_state.modelmatrix = *matrix;
+               Matrix4x4_Concat(&gl_state.modelviewmatrix, &gl_state.viewport.viewmatrix, &gl_state.modelmatrix);
+               Matrix4x4_ToArrayFloatGL(&gl_state.modelviewmatrix, glmatrix);
                CHECKGLERROR
                qglLoadMatrixf(glmatrix);CHECKGLERROR
        }
@@ -1690,40 +1545,32 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co
        }
 }
 
-void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, int texcubemap, int texrectangle)
+int R_Mesh_TexBound(unsigned int unitnum, int id)
 {
        gltextureunit_t *unit = gl_state.units + unitnum;
-       if (unitnum >= backendimageunits)
+       if (unitnum >= vid.teximageunits)
+               return 0;
+       if (id == GL_TEXTURE_2D)
+               return unit->t2d;
+       if (id == GL_TEXTURE_3D)
+               return unit->t3d;
+       if (id == GL_TEXTURE_CUBE_MAP_ARB)
+               return unit->tcubemap;
+       if (id == GL_TEXTURE_RECTANGLE_ARB)
+               return unit->trectangle;
+       return 0;
+}
+
+void R_Mesh_TexBindAll(unsigned int unitnum, int tex2d, int tex3d, int texcubemap, int texrectangle)
+{
+       gltextureunit_t *unit = gl_state.units + unitnum;
+       if (unitnum >= vid.teximageunits)
                return;
-       // update 1d texture binding
-       if (unit->t1d != tex1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (tex1d)
-                       {
-                               if (unit->t1d == 0)
-                               {
-                                       qglEnable(GL_TEXTURE_1D);CHECKGLERROR
-                               }
-                       }
-                       else
-                       {
-                               if (unit->t1d)
-                               {
-                                       qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                               }
-                       }
-               }
-               unit->t1d = tex1d;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
        // update 2d texture binding
        if (unit->t2d != tex2d)
        {
                GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
+               if (unitnum < vid.texunits)
                {
                        if (tex2d)
                        {
@@ -1747,7 +1594,7 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in
        if (unit->t3d != tex3d)
        {
                GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
+               if (unitnum < vid.texunits)
                {
                        if (tex3d)
                        {
@@ -1771,7 +1618,7 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in
        if (unit->tcubemap != texcubemap)
        {
                GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
+               if (unitnum < vid.texunits)
                {
                        if (texcubemap)
                        {
@@ -1795,7 +1642,7 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in
        if (unit->trectangle != texrectangle)
        {
                GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
+               if (unitnum < vid.texunits)
                {
                        if (texrectangle)
                        {
@@ -1817,117 +1664,16 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in
        }
 }
 
-void R_Mesh_TexBind1D(unsigned int unitnum, int texnum)
-{
-       gltextureunit_t *unit = gl_state.units + unitnum;
-       if (unitnum >= backendimageunits)
-               return;
-       // update 1d texture binding
-       if (unit->t1d != texnum)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (texnum)
-                       {
-                               if (unit->t1d == 0)
-                               {
-                                       qglEnable(GL_TEXTURE_1D);CHECKGLERROR
-                               }
-                       }
-                       else
-                       {
-                               if (unit->t1d)
-                               {
-                                       qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                               }
-                       }
-               }
-               unit->t1d = texnum;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
-       // update 2d texture binding
-       if (unit->t2d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t2d)
-                       {
-                               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
-                       }
-               }
-               unit->t2d = 0;
-               qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
-       }
-       // update 3d texture binding
-       if (unit->t3d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t3d)
-                       {
-                               qglDisable(GL_TEXTURE_3D);CHECKGLERROR
-                       }
-               }
-               unit->t3d = 0;
-               qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
-       }
-       // update cubemap texture binding
-       if (unit->tcubemap)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->tcubemap)
-                       {
-                               qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-                       }
-               }
-               unit->tcubemap = 0;
-               qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
-       }
-       // update rectangle texture binding
-       if (unit->trectangle)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->trectangle)
-                       {
-                               qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
-                       }
-               }
-               unit->trectangle = 0;
-               qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
-       }
-}
-
 void R_Mesh_TexBind(unsigned int unitnum, int texnum)
 {
        gltextureunit_t *unit = gl_state.units + unitnum;
-       if (unitnum >= backendimageunits)
+       if (unitnum >= vid.teximageunits)
                return;
-       // update 1d texture binding
-       if (unit->t1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t1d)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-               }
-               unit->t1d = 0;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
        // update 2d texture binding
        if (unit->t2d != texnum)
        {
                GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
+               if (unitnum < vid.texunits)
                {
                        if (texnum)
                        {
@@ -1951,7 +1697,7 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum)
        if (unit->t3d)
        {
                GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
+               if (unitnum < vid.texunits)
                {
                        if (unit->t3d)
                        {
@@ -1965,94 +1711,7 @@ void R_Mesh_TexBind(unsigned int unitnum, int texnum)
        if (unit->tcubemap != 0)
        {
                GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->tcubemap)
-                       {
-                               qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-                       }
-               }
-               unit->tcubemap = 0;
-               qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
-       }
-       // update rectangle texture binding
-       if (unit->trectangle != 0)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->trectangle)
-                       {
-                               qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
-                       }
-               }
-               unit->trectangle = 0;
-               qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
-       }
-}
-
-void R_Mesh_TexBind3D(unsigned int unitnum, int texnum)
-{
-       gltextureunit_t *unit = gl_state.units + unitnum;
-       if (unitnum >= backendimageunits)
-               return;
-       // update 1d texture binding
-       if (unit->t1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t1d)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-               }
-               unit->t1d = 0;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
-       // update 2d texture binding
-       if (unit->t2d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t2d)
-                       {
-                               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
-                       }
-               }
-               unit->t2d = 0;
-               qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
-       }
-       // update 3d texture binding
-       if (unit->t3d != texnum)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (texnum)
-                       {
-                               if (unit->t3d == 0)
-                               {
-                                       qglEnable(GL_TEXTURE_3D);CHECKGLERROR
-                               }
-                       }
-                       else
-                       {
-                               if (unit->t3d)
-                               {
-                                       qglDisable(GL_TEXTURE_3D);CHECKGLERROR
-                               }
-                       }
-               }
-               unit->t3d = texnum;
-               qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
-       }
-       // update cubemap texture binding
-       if (unit->tcubemap != 0)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
+               if (unitnum < vid.texunits)
                {
                        if (unit->tcubemap)
                        {
@@ -2066,94 +1725,7 @@ void R_Mesh_TexBind3D(unsigned int unitnum, int texnum)
        if (unit->trectangle != 0)
        {
                GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->trectangle)
-                       {
-                               qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
-                       }
-               }
-               unit->trectangle = 0;
-               qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
-       }
-}
-
-void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum)
-{
-       gltextureunit_t *unit = gl_state.units + unitnum;
-       if (unitnum >= backendimageunits)
-               return;
-       // update 1d texture binding
-       if (unit->t1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t1d)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-               }
-               unit->t1d = 0;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
-       // update 2d texture binding
-       if (unit->t2d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t2d)
-                       {
-                               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
-                       }
-               }
-               unit->t2d = 0;
-               qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
-       }
-       // update 3d texture binding
-       if (unit->t3d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t3d)
-                       {
-                               qglDisable(GL_TEXTURE_3D);CHECKGLERROR
-                       }
-               }
-               unit->t3d = 0;
-               qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
-       }
-       // update cubemap texture binding
-       if (unit->tcubemap != texnum)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (texnum)
-                       {
-                               if (unit->tcubemap == 0)
-                               {
-                                       qglEnable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-                               }
-                       }
-                       else
-                       {
-                               if (unit->tcubemap)
-                               {
-                                       qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-                               }
-                       }
-               }
-               unit->tcubemap = texnum;
-               qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
-       }
-       // update rectangle texture binding
-       if (unit->trectangle != 0)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
+               if (unitnum < vid.texunits)
                {
                        if (unit->trectangle)
                        {
@@ -2165,111 +1737,24 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum)
        }
 }
 
-void R_Mesh_TexBindRectangle(unsigned int unitnum, int texnum)
-{
-       gltextureunit_t *unit = gl_state.units + unitnum;
-       if (unitnum >= backendimageunits)
-               return;
-       // update 1d texture binding
-       if (unit->t1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t1d)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-               }
-               unit->t1d = 0;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
-       // update 2d texture binding
-       if (unit->t2d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t2d)
-                       {
-                               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
-                       }
-               }
-               unit->t2d = 0;
-               qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
-       }
-       // update 3d texture binding
-       if (unit->t3d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t3d)
-                       {
-                               qglDisable(GL_TEXTURE_3D);CHECKGLERROR
-                       }
-               }
-               unit->t3d = 0;
-               qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
-       }
-       // update cubemap texture binding
-       if (unit->tcubemap != 0)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->tcubemap)
-                       {
-                               qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-                       }
-               }
-               unit->tcubemap = 0;
-               qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
-       }
-       // update rectangle texture binding
-       if (unit->trectangle != texnum)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (texnum)
-                       {
-                               if (unit->trectangle == 0)
-                               {
-                                       qglEnable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
-                               }
-                       }
-                       else
-                       {
-                               if (unit->trectangle)
-                               {
-                                       qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
-                               }
-                       }
-               }
-               unit->trectangle = texnum;
-               qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
-       }
-}
-
-static const double gl_identitymatrix[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1};
+static const float 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;
-       if (matrix->m[3][3])
+       if (matrix && matrix->m[3][3])
        {
                // texmatrix specified, check if it is different
                if (!unit->texmatrixenabled || memcmp(&unit->matrix, matrix, sizeof(matrix4x4_t)))
                {
-                       double glmatrix[16];
+                       float glmatrix[16];
                        unit->texmatrixenabled = true;
                        unit->matrix = *matrix;
                        CHECKGLERROR
-                       Matrix4x4_ToArrayDoubleGL(&unit->matrix, glmatrix);
+                       Matrix4x4_ToArrayFloatGL(&unit->matrix, glmatrix);
                        GL_ActiveTexture(unitnum);
                        qglMatrixMode(GL_TEXTURE);CHECKGLERROR
-                       qglLoadMatrixd(glmatrix);CHECKGLERROR
+                       qglLoadMatrixf(glmatrix);CHECKGLERROR
                        qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
                }
        }
@@ -2293,8 +1778,12 @@ void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, i
 {
        gltextureunit_t *unit = gl_state.units + unitnum;
        CHECKGLERROR
-       if (gl_combine.integer)
+       switch(vid.renderpath)
        {
+       case RENDERPATH_GL20:
+               // do nothing
+               break;
+       case RENDERPATH_GL13:
                // GL_ARB_texture_env_combine
                if (!combinergb)
                        combinergb = GL_MODULATE;
@@ -2304,74 +1793,66 @@ void R_Mesh_TexCombine(unsigned int unitnum, int combinergb, int combinealpha, i
                        rgbscale = 1;
                if (!alphascale)
                        alphascale = 1;
-               if (unit->combinergb != combinergb)
-               {
-                       unit->combinergb = combinergb;
-                       GL_ActiveTexture(unitnum);
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR
-               }
-               if (unit->combinealpha != combinealpha)
-               {
-                       unit->combinealpha = combinealpha;
-                       GL_ActiveTexture(unitnum);
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR
-               }
-               if (unit->rgbscale != rgbscale)
+               if (combinergb != combinealpha || rgbscale != 1 || alphascale != 1)
                {
-                       GL_ActiveTexture(unitnum);
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = rgbscale));CHECKGLERROR
+                       if (combinergb == GL_DECAL)
+                               combinergb = GL_INTERPOLATE_ARB;
+                       if (unit->combine != GL_COMBINE_ARB)
+                       {
+                               unit->combine = GL_COMBINE_ARB;
+                               GL_ActiveTexture(unitnum);
+                               qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);CHECKGLERROR
+                               qglTexEnvi(GL_TEXTURE_ENV, GL_SOURCE2_RGB_ARB, GL_TEXTURE);CHECKGLERROR // for GL_INTERPOLATE_ARB mode
+                       }
+                       if (unit->combinergb != combinergb)
+                       {
+                               unit->combinergb = combinergb;
+                               GL_ActiveTexture(unitnum);
+                               qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR
+                       }
+                       if (unit->combinealpha != combinealpha)
+                       {
+                               unit->combinealpha = combinealpha;
+                               GL_ActiveTexture(unitnum);
+                               qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR
+                       }
+                       if (unit->rgbscale != rgbscale)
+                       {
+                               unit->rgbscale = rgbscale;
+                               GL_ActiveTexture(unitnum);
+                               qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, unit->rgbscale);CHECKGLERROR
+                       }
+                       if (unit->alphascale != alphascale)
+                       {
+                               unit->alphascale = alphascale;
+                               GL_ActiveTexture(unitnum);
+                               qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, unit->alphascale);CHECKGLERROR
+                       }
                }
-               if (unit->alphascale != alphascale)
+               else
                {
-                       GL_ActiveTexture(unitnum);
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (unit->alphascale = alphascale));CHECKGLERROR
+                       if (unit->combine != combinergb)
+                       {
+                               unit->combine = combinergb;
+                               GL_ActiveTexture(unitnum);
+                               qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combine);CHECKGLERROR
+                       }
                }
-       }
-       else
-       {
+               break;
+       case RENDERPATH_GL11:
                // normal GL texenv
                if (!combinergb)
                        combinergb = GL_MODULATE;
-               if (unit->combinergb != combinergb)
+               if (unit->combine != combinergb)
                {
-                       unit->combinergb = combinergb;
+                       unit->combine = combinergb;
                        GL_ActiveTexture(unitnum);
-                       qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR
+                       qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combine);CHECKGLERROR
                }
+               break;
        }
 }
 
-void R_Mesh_TextureState(const rmeshstate_t *m)
-{
-       unsigned int i;
-
-       BACKENDACTIVECHECK
-
-       CHECKGLERROR
-       if (gl_backend_rebindtextures)
-       {
-               gl_backend_rebindtextures = false;
-               GL_SetupTextureState();
-               CHECKGLERROR
-       }
-
-       for (i = 0;i < backendimageunits;i++)
-               R_Mesh_TexBindAll(i, m->tex1d[i], m->tex[i], m->tex3d[i], m->texcubemap[i], m->texrectangle[i]);
-       for (i = 0;i < backendarrayunits;i++)
-       {
-               if (m->pointer_texcoord3f[i])
-                       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], m->pointer_texcoord_bufferobject[i], m->pointer_texcoord_bufferoffset[i]);
-       }
-       for (i = 0;i < backendunits;i++)
-       {
-               R_Mesh_TexMatrix(i, &m->texmatrix[i]);
-               R_Mesh_TexCombine(i, m->texcombinergb[i], m->texcombinealpha[i], m->texrgbscale[i], m->texalphascale[i]);
-       }
-       CHECKGLERROR
-}
-
 void R_Mesh_ResetTextureState(void)
 {
        unsigned int unitnum;
@@ -2379,132 +1860,118 @@ void R_Mesh_ResetTextureState(void)
        BACKENDACTIVECHECK
 
        CHECKGLERROR
-       if (gl_backend_rebindtextures)
+       switch(vid.renderpath)
        {
-               gl_backend_rebindtextures = false;
-               GL_SetupTextureState();
-               CHECKGLERROR
-       }
-
-       for (unitnum = 0;unitnum < backendimageunits;unitnum++)
-       {
-               gltextureunit_t *unit = gl_state.units + unitnum;
-               // update 1d texture binding
-               if (unit->t1d)
+       case RENDERPATH_GL20:
+               for (unitnum = 0;unitnum < vid.teximageunits;unitnum++)
                {
-                       GL_ActiveTexture(unitnum);
-                       if (unitnum < backendunits)
+                       gltextureunit_t *unit = gl_state.units + unitnum;
+                       if (unit->t2d)
                        {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
+                               unit->t2d = 0;
+                               GL_ActiveTexture(unitnum);
+                               qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
                        }
-                       unit->t1d = 0;
-                       qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-               }
-               // update 2d texture binding
-               if (unit->t2d)
-               {
-                       GL_ActiveTexture(unitnum);
-                       if (unitnum < backendunits)
+                       if (unit->t3d)
                        {
-                               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
+                               unit->t3d = 0;
+                               GL_ActiveTexture(unitnum);
+                               qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
                        }
-                       unit->t2d = 0;
-                       qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
-               }
-               // update 3d texture binding
-               if (unit->t3d)
-               {
-                       GL_ActiveTexture(unitnum);
-                       if (unitnum < backendunits)
+                       if (unit->tcubemap)
                        {
-                               qglDisable(GL_TEXTURE_3D);CHECKGLERROR
+                               unit->tcubemap = 0;
+                               GL_ActiveTexture(unitnum);
+                               qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
                        }
-                       unit->t3d = 0;
-                       qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
-               }
-               // update cubemap texture binding
-               if (unit->tcubemap)
-               {
-                       GL_ActiveTexture(unitnum);
-                       if (unitnum < backendunits)
+                       if (unit->trectangle)
                        {
-                               qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
+                               unit->trectangle = 0;
+                               GL_ActiveTexture(unitnum);
+                               qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
                        }
-                       unit->tcubemap = 0;
-                       qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
                }
-               // update rectangle texture binding
-               if (unit->trectangle)
+               for (unitnum = 0;unitnum < vid.texarrayunits;unitnum++)
                {
-                       GL_ActiveTexture(unitnum);
-                       if (unitnum < backendunits)
+                       gltextureunit_t *unit = gl_state.units + unitnum;
+                       if (unit->arrayenabled)
                        {
-                               qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
+                               unit->arrayenabled = false;
+                               GL_ClientActiveTexture(unitnum);
+                               qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
                        }
-                       unit->trectangle = 0;
-                       qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
-               }
-       }
-       for (unitnum = 0;unitnum < backendarrayunits;unitnum++)
-       {
-               gltextureunit_t *unit = gl_state.units + unitnum;
-               // texture array unit is disabled, disable the array
-               if (unit->arrayenabled)
-               {
-                       unit->arrayenabled = false;
-                       GL_ClientActiveTexture(unitnum);
-                       qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
                }
-       }
-       for (unitnum = 0;unitnum < backendunits;unitnum++)
-       {
-               gltextureunit_t *unit = gl_state.units + unitnum;
-               // no texmatrix specified, revert to identity
-               if (unit->texmatrixenabled)
+               for (unitnum = 0;unitnum < vid.texunits;unitnum++)
                {
-                       unit->texmatrixenabled = false;
-                       unit->matrix = identitymatrix;
-                       CHECKGLERROR
-                       GL_ActiveTexture(unitnum);
-                       qglMatrixMode(GL_TEXTURE);CHECKGLERROR
-                       qglLoadIdentity();CHECKGLERROR
-                       qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+                       gltextureunit_t *unit = gl_state.units + unitnum;
+                       if (unit->texmatrixenabled)
+                       {
+                               unit->texmatrixenabled = false;
+                               unit->matrix = identitymatrix;
+                               CHECKGLERROR
+                               GL_ActiveTexture(unitnum);
+                               qglMatrixMode(GL_TEXTURE);CHECKGLERROR
+                               qglLoadIdentity();CHECKGLERROR
+                               qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+                       }
                }
-               if (gl_combine.integer)
+               break;
+       case RENDERPATH_GL13:
+       case RENDERPATH_GL11:
+               for (unitnum = 0;unitnum < vid.texunits;unitnum++)
                {
-                       // GL_ARB_texture_env_combine
-                       if (unit->combinergb != GL_MODULATE)
+                       gltextureunit_t *unit = gl_state.units + unitnum;
+                       if (unit->t2d)
                        {
-                               unit->combinergb = GL_MODULATE;
+                               unit->t2d = 0;
                                GL_ActiveTexture(unitnum);
-                               qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR
+                               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
+                               qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
                        }
-                       if (unit->combinealpha != GL_MODULATE)
+                       if (unit->t3d)
                        {
-                               unit->combinealpha = GL_MODULATE;
+                               unit->t3d = 0;
                                GL_ActiveTexture(unitnum);
-                               qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR
+                               qglDisable(GL_TEXTURE_3D);CHECKGLERROR
+                               qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
                        }
-                       if (unit->rgbscale != 1)
+                       if (unit->tcubemap)
                        {
+                               unit->tcubemap = 0;
                                GL_ActiveTexture(unitnum);
-                               qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = 1));CHECKGLERROR
+                               qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
+                               qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
                        }
-                       if (unit->alphascale != 1)
+                       if (unit->trectangle)
                        {
+                               unit->trectangle = 0;
                                GL_ActiveTexture(unitnum);
-                               qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (unit->alphascale = 1));CHECKGLERROR
+                               qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
+                               qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
                        }
-               }
-               else
-               {
-                       // normal GL texenv
-                       if (unit->combinergb != GL_MODULATE)
+                       if (unit->arrayenabled)
                        {
-                               unit->combinergb = GL_MODULATE;
+                               unit->arrayenabled = false;
+                               GL_ClientActiveTexture(unitnum);
+                               qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
+                       }
+                       if (unit->texmatrixenabled)
+                       {
+                               unit->texmatrixenabled = false;
+                               unit->matrix = identitymatrix;
+                               CHECKGLERROR
                                GL_ActiveTexture(unitnum);
-                               qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR
+                               qglMatrixMode(GL_TEXTURE);CHECKGLERROR
+                               qglLoadIdentity();CHECKGLERROR
+                               qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
+                       }
+                       if (unit->combine != GL_MODULATE)
+                       {
+                               unit->combine = GL_MODULATE;
+                               GL_ActiveTexture(unitnum);
+                               qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combine);CHECKGLERROR
                        }
                }
+               break;
        }
 }