summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-08-17 12:58:52 +0200
committeraap <aap@papnet.eu>2021-08-17 12:58:52 +0200
commitdc4ee41b70d007d5dd300c07c40da29810ad908e (patch)
tree9bcf51cf686c71a9a8c98a9ab971858533b002fb
parentMerge pull request #1300 from erorcun/miami (diff)
downloadre3-dc4ee41b70d007d5dd300c07c40da29810ad908e.tar
re3-dc4ee41b70d007d5dd300c07c40da29810ad908e.tar.gz
re3-dc4ee41b70d007d5dd300c07c40da29810ad908e.tar.bz2
re3-dc4ee41b70d007d5dd300c07c40da29810ad908e.tar.lz
re3-dc4ee41b70d007d5dd300c07c40da29810ad908e.tar.xz
re3-dc4ee41b70d007d5dd300c07c40da29810ad908e.tar.zst
re3-dc4ee41b70d007d5dd300c07c40da29810ad908e.zip
-rw-r--r--src/extras/screendroplets.cpp4
m---------vendor/librw0
2 files changed, 2 insertions, 2 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
-Subproject a5bc97232293250ae1bbd6ef6642532a541034c
+Subproject 4c4b199057e9570557cdf108d21795236a07675