allow use of cvar gl_vbo_dynamicindex in RENDERPATH_GLES2

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11959 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=df69ff9acd9810e5ede63838e599bf591f6fae8d

diff --git a/gl_backend.c b/gl_backend.c
index 65719e86395f18b71b4bf79e17b4d9d9be82b10b..dc12b1540436eadbe83ca894d34e6409e4952728 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -386,9 +386,9 @@ static void R_Mesh_SetUseVBO(void)
                break;
        case RENDERPATH_GLES2:
                gl_state.usevbo_staticvertex = (vid.support.arb_vertex_buffer_object && gl_vbo.integer) || vid.forcevbo;
-               gl_state.usevbo_staticindex = false;
+               gl_state.usevbo_staticindex = (vid.support.arb_vertex_buffer_object && gl_vbo.integer) || vid.forcevbo;
                gl_state.usevbo_dynamicvertex = (vid.support.arb_vertex_buffer_object && gl_vbo_dynamicvertex.integer) || vid.forcevbo;
-               gl_state.usevbo_dynamicindex = false;
+               gl_state.usevbo_dynamicindex = (vid.support.arb_vertex_buffer_object && gl_vbo_dynamicindex.integer) || vid.forcevbo;
                break;
        }
 }

diff --git a/gl_rmain.c b/gl_rmain.c
index 874c7a0dd088aa4ca01b4e3b70b77b0fb71fea8a..14e2551c9681609e382df2f894c171eaeb84a208 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -1374,6 +1374,7 @@ static void R_SetupShader_SetPermutationGLSL(unsigned int mode, unsigned int per
        if (r_glsl_permutation->loc_ModelViewProjectionMatrix >= 0) qglUniformMatrix4fv(r_glsl_permutation->loc_ModelViewProjectionMatrix, 1, false, gl_modelviewprojection16f);
        if (r_glsl_permutation->loc_ModelViewMatrix >= 0) qglUniformMatrix4fv(r_glsl_permutation->loc_ModelViewMatrix, 1, false, gl_modelview16f);
        if (r_glsl_permutation->loc_ClientTime >= 0) qglUniform1f(r_glsl_permutation->loc_ClientTime, cl.time);
+       CHECKGLERROR
 }
 
 #ifdef SUPPORTD3D