diff options
| author | Dave Airlie <[email protected]> | 2015-07-23 10:49:12 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2015-07-23 17:25:16 +1000 |
| commit | 24b0e5068348aacabbd3e0012de95d34866e4b99 (patch) | |
| tree | 5c5aa7922d772bc76777157156e215094af8a18e | |
| parent | cc172fddf3fc37991c6d85f2d8e4f6dc63a62809 (diff) | |
dispatch_sanity: add shader subroutine to fix make check
Add the shader subroutine to the core only API list,
and fixup dispatch_sanity to suit.
Acked-by: Kenneth Graunke <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/apiexec.py | 11 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 18 |
2 files changed, 21 insertions, 8 deletions
diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py index b623b44beeb..66bc79ac405 100644 --- a/src/mapi/glapi/gen/apiexec.py +++ b/src/mapi/glapi/gen/apiexec.py @@ -74,6 +74,17 @@ functions = { # GL_ARB_geometry_shader4, so OpenGL 3.2 is required. "FramebufferTexture": exec_info(core=32), + # OpenGL 4.0 / GL_ARB_shader_subroutines. Mesa only exposes this + # extension with core profile. + "glGetSubroutineUniformLocation": exec_info(core=31), + "glGetSubroutineIndex": exec_info(core=31), + "glGetActiveSubroutineUniformiv": exec_info(core=31), + "glGetActiveSubroutineUniformName": exec_info(core=31), + "glGetActiveSubroutineName": exec_info(core=31), + "glUniformSubroutinesuiv": exec_info(core=31), + "glGetUniformSubroutineuiv": exec_info(core=31), + "glGetProgramStageiv": exec_info(core=31), + # OpenGL 4.0 / GL_ARB_gpu_shader_fp64. The extension spec says: # # "OpenGL 3.2 and GLSL 1.50 are required." diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index d1bd0cee61e..af89d2c1cfb 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -1431,6 +1431,16 @@ 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 }, @@ -1569,14 +1579,6 @@ const struct function gl_core_functions_possible[] = { { "glUniformMatrix4x2dv", 40, -1 }, { "glUniformMatrix4x3dv", 40, -1 }, { "glGetUniformdv", 43, -1 }, -// { "glGetSubroutineUniformLocation", 43, -1 }, // XXX: Add to xml -// { "glGetSubroutineIndex", 43, -1 }, // XXX: Add to xml -// { "glGetActiveSubroutineUniformiv", 43, -1 }, // XXX: Add to xml -// { "glGetActiveSubroutineUniformName", 43, -1 }, // XXX: Add to xml -// { "glGetActiveSubroutineName", 43, -1 }, // XXX: Add to xml -// { "glUniformSubroutinesuiv", 43, -1 }, // XXX: Add to xml -// { "glGetUniformSubroutineuiv", 43, -1 }, // XXX: Add to xml -// { "glGetProgramStageiv", 43, -1 }, // XXX: Add to xml { "glBindTransformFeedback", 43, -1 }, { "glDeleteTransformFeedbacks", 43, -1 }, |