From 6b4b11d80e3b89b179a77d79ae77d0f1ad901b7c Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 17 Aug 2021 12:59:13 +0200 Subject: fix opengl; update librw --- src/extras/screendroplets.cpp | 4 ++-- vendor/librw | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/extras/screendroplets.cpp b/src/extras/screendroplets.cpp index 2485386b..cc86808f 100644 --- a/src/extras/screendroplets.cpp +++ b/src/extras/screendroplets.cpp @@ -741,7 +741,7 @@ uint32 im2D_UV2_Vao; void openim2d_uv2(void) { - u_xform = rw::gl3::registerUniform("u_xform"); // this doesn't add a new one, so it's safe + u_xform = rw::gl3::registerUniform("u_xform", rw::gl3::UNIFORM_VEC4); // this doesn't add a new one, so it's safe glGenBuffers(1, &im2D_UV2_Ibo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, im2D_UV2_Ibo); @@ -803,7 +803,7 @@ RenderIndexedPrimitive_UV2(RwPrimitiveType primType, Im2DVertexUV2 *vertices, Rw setAttribPointers(im2d_UV2_attribDesc, 4); #endif - glUniform4fv(currentShader->uniformLocations[u_xform], 1, xform); + setUniform(u_xform, xform); flushCache(); glDrawElements(primTypeMap[primType], numIndices, diff --git a/vendor/librw b/vendor/librw index a5bc9723..4c4b1990 160000 --- a/vendor/librw +++ b/vendor/librw @@ -1 +1 @@ -Subproject commit a5bc97232293250ae1bbd6ef6642532a541034ca +Subproject commit 4c4b199057e9570557cdf108d21795236a076755 -- cgit v1.2.3