[Mesa-dev] [PATCH 3/5] vbo: fix ARB_multi_draw_indirect for the compatibility profile

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

---
 src/mesa/vbo/vbo_exec_array.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 58bba208db1..9d3e894c164 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -2074,41 +2074,41 @@ vbo_initialize_exec_dispatch(const struct gl_context *ctx,
       SET_DrawElementsInstancedBaseVertexBaseInstance(exec,
                                                       vbo_exec_DrawElementsInstancedBaseVertexBaseInstance);
    }
 
    if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles31(ctx)) {
       SET_DrawArraysIndirect(exec, vbo_exec_DrawArraysIndirect);
       SET_DrawElementsIndirect(exec, vbo_exec_DrawElementsIndirect);
    }
 
    if (ctx->API == API_OPENGL_CORE) {
-      SET_MultiDrawArraysIndirect(exec, vbo_exec_MultiDrawArraysIndirect);
-      SET_MultiDrawElementsIndirect(exec, vbo_exec_MultiDrawElementsIndirect);
       SET_MultiDrawArraysIndirectCountARB(exec,
                                           vbo_exec_MultiDrawArraysIndirectCount);
       SET_MultiDrawElementsIndirectCountARB(exec,
                                             vbo_exec_MultiDrawElementsIndirectCount);
    }
 
    if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_DrawArraysInstancedARB(exec, vbo_exec_DrawArraysInstanced);
       SET_DrawElementsInstancedARB(exec, vbo_exec_DrawElementsInstanced);
    }
 
    if (_mesa_is_desktop_gl(ctx)) {
       SET_DrawTransformFeedback(exec, vbo_exec_DrawTransformFeedback);
       SET_DrawTransformFeedbackStream(exec,
                                       vbo_exec_DrawTransformFeedbackStream);
       SET_DrawTransformFeedbackInstanced(exec,
                                          vbo_exec_DrawTransformFeedbackInstanced);
       SET_DrawTransformFeedbackStreamInstanced(exec,
                                                vbo_exec_DrawTransformFeedbackStreamInstanced);
+      SET_MultiDrawArraysIndirect(exec, vbo_exec_MultiDrawArraysIndirect);
+      SET_MultiDrawElementsIndirect(exec, vbo_exec_MultiDrawElementsIndirect);
    }
 }
 
 
 
 /**
  * The following functions are only used for OpenGL ES 1/2 support.
  * And some aren't even supported (yet) in ES 1/2.
  */
 
-- 
2.17.1