AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dispatch_sanity: add shader subroutine to fix make check

Browse Source 
Add the shader subroutine to the core only API list,
and fixup dispatch_sanity to suit.

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2015-07-23 10:49:12 +10:00
parent cc172fddf3
commit 24b0e50683
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mapi/glapi/gen/apiexec.py
+11
View File
@@ -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."
src/mesa/main/tests/dispatch_sanity.cpp
+10 -8
View File
@@ -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 },