Module: Mesa Branch: master Commit: 987c2ece033cb486314dcc00d834fa0b9d22162d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=987c2ece033cb486314dcc00d834fa0b9d22162d
Author: Marek Olšák <[email protected]> Date: Mon Jul 16 23:16:31 2018 -0400 mesa: expose ARB_indirect_parameters in the compatibility profile Reviewed-by: Timothy Arceri <[email protected]> (v1) v2: fix dispatch_sanity --- src/mesa/main/extensions_table.h | 2 +- src/mesa/main/tests/dispatch_sanity.cpp | 8 ++++---- src/mesa/vbo/vbo_exec_array.c | 11 ++++------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 3758a95f05..f4f7f01d6e 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -80,7 +80,7 @@ EXT(ARB_gpu_shader_fp64 , ARB_gpu_shader_fp64 EXT(ARB_gpu_shader_int64 , ARB_gpu_shader_int64 , x , GLC, x , x , 2015) EXT(ARB_half_float_pixel , dummy_true , GLL, GLC, x , x , 2003) EXT(ARB_half_float_vertex , ARB_half_float_vertex , GLL, GLC, x , x , 2008) -EXT(ARB_indirect_parameters , ARB_indirect_parameters , x , GLC, x , x , 2013) +EXT(ARB_indirect_parameters , ARB_indirect_parameters , GLL, GLC, x , x , 2013) EXT(ARB_instanced_arrays , ARB_instanced_arrays , GLL, GLC, x , x , 2008) EXT(ARB_internalformat_query , ARB_internalformat_query , GLL, GLC, x , x , 2011) EXT(ARB_internalformat_query2 , ARB_internalformat_query2 , GLL, GLC, x , x , 2013) diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index ec4f9dd08f..d1d063636a 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -1188,6 +1188,10 @@ const struct function common_desktop_functions_possible[] = { { "glNamedFramebufferSampleLocationsfvARB", 30, -1 }, { "glEvaluateDepthValuesARB", 30, -1 }, + /* GL_ARB_indirect_parameters */ + { "glMultiDrawArraysIndirectCountARB", 11, -1 }, + { "glMultiDrawElementsIndirectCountARB", 11, -1 }, + { NULL, 0, -1 } }; @@ -1938,10 +1942,6 @@ const struct function gl_core_functions_possible[] = { /* GL 4.5 */ { "glMemoryBarrierByRegion", 45, -1 }, - /* GL_ARB_indirect_parameters */ - { "glMultiDrawArraysIndirectCountARB", 31, -1 }, - { "glMultiDrawElementsIndirectCountARB", 31, -1 }, - /* GL_ARB_ES3_2_compatibility */ { "glPrimitiveBoundingBoxARB", 45, -1 }, diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index 9d3e894c16..51c000e7bd 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); } } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
