From fbecf87086c94afa24e82c09f8211c24bf6ffcc7 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 27 Jun 2013 05:53:59 +0000 Subject: [PATCH] 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 --- gl_backend.c | 4 ++-- gl_rmain.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gl_backend.c b/gl_backend.c index 65719e86..dc12b154 100644 --- 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 874c7a0d..14e2551c 100644 --- 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 -- 2.39.2