mirror of
https://github.com/halpz/re3
synced 2024-11-17 07:48:47 +01:00
fix opengl; update librw
This commit is contained in:
parent
16ff379ebe
commit
6b4b11d80e
2 changed files with 3 additions and 3 deletions
|
@ -741,7 +741,7 @@ uint32 im2D_UV2_Vao;
|
||||||
void
|
void
|
||||||
openim2d_uv2(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);
|
glGenBuffers(1, &im2D_UV2_Ibo);
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 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);
|
setAttribPointers(im2d_UV2_attribDesc, 4);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
glUniform4fv(currentShader->uniformLocations[u_xform], 1, xform);
|
setUniform(u_xform, xform);
|
||||||
|
|
||||||
flushCache();
|
flushCache();
|
||||||
glDrawElements(primTypeMap[primType], numIndices,
|
glDrawElements(primTypeMap[primType], numIndices,
|
||||||
|
|
2
vendor/librw
vendored
2
vendor/librw
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit a5bc97232293250ae1bbd6ef6642532a541034ca
|
Subproject commit 4c4b199057e9570557cdf108d21795236a076755
|
Loading…
Reference in a new issue