aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2018-06-20 10:55:34 +1000
committerTimothy Arceri <[email protected]>2018-06-30 08:38:33 +1000
commitdf5e22cb7df6ee2e251a977aaecaa0bae4a5b3c9 (patch)
tree86a34826826f18a478cce4308b36db6a565c3415 /src/mesa
parent05f3589e67f3d43a971522332595d75a0bc493dc (diff)
mesa: enable ARB_shader_subroutine in compat profile
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/extensions_table.h2
-rw-r--r--src/mesa/main/tests/dispatch_sanity.cpp19
2 files changed, 10 insertions, 11 deletions
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 5fe2e88fe98..11345febe2e 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 6b319d8b030..ed99f1a1957 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 },