fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: enable ARB_shader_subroutine in compat profile

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri 2018-06-20 10:55:34 +10:00
parent 05f3589e67
commit df5e22cb7d
3 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mapi/glapi/gen/apiexec.py
View file

@ -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:
#

2
src/mesa/main/extensions_table.h
View file

@ -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)

19
src/mesa/main/tests/dispatch_sanity.cpp
View file

@ -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 },