From b3be1236c3737025daed2b5eca4cb08dfa390b97 Mon Sep 17 00:00:00 2001 From: Rinnegatamante Date: Sun, 18 Oct 2020 23:29:03 +0200 Subject: [PATCH] Moved uniforms setup after uniform cache flushing. --- src/gl/gl3immed.cpp | 8 ++++---- src/gl/gl3shader.cpp | 10 ---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/gl/gl3immed.cpp b/src/gl/gl3immed.cpp index 064a75e..0f48f52 100644 --- a/src/gl/gl3immed.cpp +++ b/src/gl/gl3immed.cpp @@ -119,9 +119,9 @@ im2DRenderPrimitive(PrimitiveType primType, void *vertices, int32 numVertices) else im2dShader->use(); - glUniform4fv(currentShader->uniformLocations[u_xform], 1, xform); - flushCache(); + glUniform4fv(currentShader->uniformLocations[u_xform], 1, xform); + vglDrawObjects(primTypeMap[primType], numVertices, GL_FALSE); } @@ -153,9 +153,9 @@ im2DRenderIndexedPrimitive(PrimitiveType primType, else im2dShader->use(); - glUniform4fv(currentShader->uniformLocations[u_xform], 1, xform); - flushCache(); + glUniform4fv(currentShader->uniformLocations[u_xform], 1, xform); + vglDrawObjects(primTypeMap[primType], numIndices, GL_FALSE); } diff --git a/src/gl/gl3shader.cpp b/src/gl/gl3shader.cpp index b0f0712..7eb88fb 100644 --- a/src/gl/gl3shader.cpp +++ b/src/gl/gl3shader.cpp @@ -146,16 +146,6 @@ linkprogram(GLint vs, GLint fs, GLuint *program, bool is_2d) glAttachShader(prog, vs); glAttachShader(prog, fs); - -#ifdef RW_GLES2 - // TODO: perhaps just do this always and get rid of the layout stuff? - glBindAttribLocation(prog, ATTRIB_POS, "in_pos"); - glBindAttribLocation(prog, ATTRIB_NORMAL, "in_normal"); - glBindAttribLocation(prog, ATTRIB_COLOR, "in_color"); - glBindAttribLocation(prog, ATTRIB_TEXCOORDS0, "in_tex0"); - glBindAttribLocation(prog, ATTRIB_WEIGHTS, "in_weights"); - glBindAttribLocation(prog, ATTRIB_INDICES, "in_indices"); -#endif int stride = 0; int pos_size = is_2d ? 4 : 3;