Module: Mesa Branch: master Commit: df5e22cb7df6ee2e251a977aaecaa0bae4a5b3c9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df5e22cb7df6ee2e251a977aaecaa0bae4a5b3c9
Author: Timothy Arceri <[email protected]> Date: Wed Jun 20 10:55:34 2018 +1000 mesa: enable ARB_shader_subroutine in compat profile Reviewed-by: Marek Olšák <[email protected]> --- src/mapi/glapi/gen/apiexec.py | 16 ++++++++-------- src/mesa/main/extensions_table.h | 2 +- src/mesa/main/tests/dispatch_sanity.cpp | 19 +++++++++---------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py index 00c8017127..e69c6b4df1 100644 --- a/src/mapi/glapi/gen/apiexec.py +++ b/src/mapi/glapi/gen/apiexec.py @@ -73,14 +73,14 @@ functions = { # OpenGL 4.0 / GL_ARB_shader_subroutines. Mesa only exposes this # extension with core profile. - "GetSubroutineUniformLocation": exec_info(core=31), - "GetSubroutineIndex": exec_info(core=31), - "GetActiveSubroutineUniformiv": exec_info(core=31), - "GetActiveSubroutineUniformName": exec_info(core=31), - "GetActiveSubroutineName": exec_info(core=31), - "UniformSubroutinesuiv": exec_info(core=31), - "GetUniformSubroutineuiv": exec_info(core=31), - "GetProgramStageiv": exec_info(core=31), + "GetSubroutineUniformLocation": exec_info(compatibility=31, core=31), + "GetSubroutineIndex": exec_info(compatibility=31, core=31), + "GetActiveSubroutineUniformiv": exec_info(compatibility=31, core=31), + "GetActiveSubroutineUniformName": exec_info(compatibility=31, core=31), + "GetActiveSubroutineName": exec_info(compatibility=31, core=31), + "UniformSubroutinesuiv": exec_info(compatibility=31, core=31), + "GetUniformSubroutineuiv": exec_info(compatibility=31, core=31), + "GetProgramStageiv": exec_info(compatibility=31, core=31), # OpenGL 4.0 / GL_ARB_gpu_shader_fp64. The extension spec says: # diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 5fe2e88fe9..11345febe2 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -123,7 +123,7 @@ EXT(ARB_shader_objects , dummy_true EXT(ARB_shader_precision , ARB_shader_precision , GLL, GLC, x , x , 2010) EXT(ARB_shader_stencil_export , ARB_shader_stencil_export , GLL, GLC, x , x , 2009) EXT(ARB_shader_storage_buffer_object , ARB_shader_storage_buffer_object , GLL, GLC, x , x , 2012) -EXT(ARB_shader_subroutine , dummy_true , x , GLC, x , x , 2010) +EXT(ARB_shader_subroutine , dummy_true , 31, GLC, x , x , 2010) EXT(ARB_shader_texture_image_samples , ARB_shader_texture_image_samples , GLL, GLC, x , x , 2014) EXT(ARB_shader_texture_lod , ARB_shader_texture_lod , GLL, GLC, x , x , 2009) EXT(ARB_shader_viewport_layer_array , ARB_shader_viewport_layer_array , x , GLC, x , x , 2015) diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 6b319d8b03..ed99f1a195 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -575,6 +575,15 @@ const struct function common_desktop_functions_possible[] = { { "glBlendFunci", 40, -1 }, { "glBlendFuncSeparatei", 40, -1 }, + { "glGetSubroutineUniformLocation", 40, -1 }, + { "glGetSubroutineIndex", 40, -1 }, + { "glGetActiveSubroutineUniformiv", 40, -1 }, + { "glGetActiveSubroutineUniformName", 40, -1 }, + { "glGetActiveSubroutineName", 40, -1 }, + { "glUniformSubroutinesuiv", 40, -1 }, + { "glGetUniformSubroutineuiv", 40, -1 }, + { "glGetProgramStageiv", 40, -1 }, + { "glUniform1d", 40, -1 }, { "glUniform2d", 40, -1 }, { "glUniform3d", 40, -1 }, @@ -1547,16 +1556,6 @@ const struct function gl_core_functions_possible[] = { /* GL 3.2 */ { "glFramebufferTexture", 32, -1 }, - /* GL 4.0 */ - { "glGetSubroutineUniformLocation", 40, -1 }, - { "glGetSubroutineIndex", 40, -1 }, - { "glGetActiveSubroutineUniformiv", 40, -1 }, - { "glGetActiveSubroutineUniformName", 40, -1 }, - { "glGetActiveSubroutineName", 40, -1 }, - { "glUniformSubroutinesuiv", 40, -1 }, - { "glGetUniformSubroutineuiv", 40, -1 }, - { "glGetProgramStageiv", 40, -1 }, - /* GL 4.3 */ { "glIsRenderbuffer", 43, -1 }, { "glBindRenderbuffer", 43, -1 }, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
