Skip to content

Commit

Permalink
Remove old emscripten workaround from GL backend.
Browse files Browse the repository at this point in the history
This was put in as a workaround for #2856. I made a fix to emscripten
itself (yay open source) in July. So, this workaround is no longer
necessary.

Verified with the rigged figure model.

emscripten-core/emscripten#11742
  • Loading branch information
prideout committed Mar 24, 2021
1 parent 3d2734b commit 582972a
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions filament/backend/src/opengl/OpenGLDriver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2380,13 +2380,6 @@ void OpenGLDriver::setRenderPrimitiveBuffer(Handle<HwRenderPrimitive> rph,
uint8_t bi = attribute.buffer;
gl.bindBuffer(GL_ARRAY_BUFFER, eb->gl.buffers[bi]);
if (UTILS_UNLIKELY(attribute.flags & Attribute::FLAG_INTEGER_TARGET)) {

// Emscripten regressed at the following PR so we work around it for now.
// https://github.com/emscripten-core/emscripten/pull/11225
#ifdef __EMSCRIPTEN__
EM_ASM_INT({ GL.currArrayBuffer = GLctx.currentArrayBufferBinding; });
#endif

glVertexAttribIPointer(GLuint(i),
getComponentCount(attribute.type),
getComponentType(attribute.type),
Expand Down

0 comments on commit 582972a

Please sign in to comment.