From 987c2ece033cb486314dcc00d834fa0b9d22162d Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Mon, 16 Jul 2018 23:16:31 -0400 Subject: mesa: expose ARB_indirect_parameters in the compatibility profile Reviewed-by: Timothy Arceri (v1) v2: fix dispatch_sanity --- src/mesa/vbo/vbo_exec_array.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/mesa/vbo') diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index 9d3e894c164..51c000e7bd9 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -2080,13 +2080,6 @@ vbo_initialize_exec_dispatch(const struct gl_context *ctx, SET_DrawElementsIndirect(exec, vbo_exec_DrawElementsIndirect); } - if (ctx->API == API_OPENGL_CORE) { - 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); @@ -2102,6 +2095,10 @@ vbo_initialize_exec_dispatch(const struct gl_context *ctx, vbo_exec_DrawTransformFeedbackStreamInstanced); SET_MultiDrawArraysIndirect(exec, vbo_exec_MultiDrawArraysIndirect); SET_MultiDrawElementsIndirect(exec, vbo_exec_MultiDrawElementsIndirect); + SET_MultiDrawArraysIndirectCountARB(exec, + vbo_exec_MultiDrawArraysIndirectCount); + SET_MultiDrawElementsIndirectCountARB(exec, + vbo_exec_MultiDrawElementsIndirectCount); } } -- cgit v1.2.3