From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 17 Jul 2018 03:14:14 +0000 (-0400)
Subject: vbo: fix ARB_multi_draw_indirect for the compatibility profile
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d40188800e5784d15e45bb89c3f6b89ee0f8e79d;p=mesa.git

vbo: fix ARB_multi_draw_indirect for the compatibility profile

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

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
@@ -2081,8 +2081,6 @@ vbo_initialize_exec_dispatch(const struct gl_context *ctx,
    }
 
    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,
@@ -2102,6 +2100,8 @@ vbo_initialize_exec_dispatch(const struct gl_context *ctx,
                                          vbo_exec_DrawTransformFeedbackInstanced);
       SET_DrawTransformFeedbackStreamInstanced(exec,
                                                vbo_exec_DrawTransformFeedbackStreamInstanced);
+      SET_MultiDrawArraysIndirect(exec, vbo_exec_MultiDrawArraysIndirect);
+      SET_MultiDrawElementsIndirect(exec, vbo_exec_MultiDrawElementsIndirect);
    }
 }