Fix no VAO bound error in Draw*Indirect

In Intel Mesa driver, dEQP-GLES31.functional.draw_indirect.random.28 is faild because of no VAO bound. This patch will fix it by adding VAO binding. BUG=angleproject:1595 TEST=dEQP-GLES31.functional.draw_indirect.random.28 Change-Id: I8e4616bc4685839efe299d2a4fad65fa73fde641 Reviewed-on: https://chromium-review.googlesource.com/423438Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Fix no VAO bound error in Draw*Indirect
ca128c7c · Jiajia Qin · Commit Bot · 3311d474 · ca128c7c
Commit ca128c7c authored Dec 23, 2016 by Jiajia Qin Committed by Commit Bot Jan 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

StateManagerGL.cpp src/libANGLE/renderer/gl/StateManagerGL.cpp +4 -2

No files found.
--- a/src/libANGLE/renderer/gl/StateManagerGL.cpp
+++ b/src/libANGLE/renderer/gl/StateManagerGL.cpp
@@ -666,12 +666,14 @@ gl::Error StateManagerGL::setDrawIndirectState(const gl::ContextState &data, GLe
 {
    const gl::State &state = data.getState();
+    const gl::VertexArray *vao = state.getVertexArray();
+    const VertexArrayGL *vaoGL = GetImplAs<VertexArrayGL>(vao);
    if (type != GL_NONE)
    {
-        const gl::VertexArray *vao = state.getVertexArray();
-        const VertexArrayGL *vaoGL = GetImplAs<VertexArrayGL>(vao);
        ANGLE_TRY(vaoGL->syncElementArrayState());
    }
+    bindVertexArray(vaoGL->getVertexArrayID(), vaoGL->getAppliedElementArrayBufferID());
    gl::Buffer *drawIndirectBuffer = state.getDrawIndirectBuffer();
    ASSERT(drawIndirectBuffer);