From: Dave Airlie <[email protected]> The code was implementing the ACTIVE_SUBROUTINE_UNIFORMS incorrectly, using the number of types not the number of uniforms. This is different than the locations as the locations may be sparsly allocated.
This fixes: GL43-CTS.shader_subroutine.four_subroutines_with_two_uniforms Signed-off-by: Dave Airlie <[email protected]> --- src/compiler/glsl/linker.cpp | 1 + src/mesa/main/mtypes.h | 1 + src/mesa/main/shaderapi.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 2374c01..a7b2a19 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -3096,6 +3096,7 @@ link_calculate_subroutine_compat(struct gl_shader_program *prog) if (!uni) continue; + sh->NumSubroutineUniforms++; count = 0; if (sh->NumSubroutineFunctions == 0) { linker_error(prog, "subroutine uniform %s defined but no valid functions found\n", uni->type->name); diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 569e0ac..05b2059 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2436,6 +2436,7 @@ struct gl_shader * Subroutine uniform remap table * based on the program level uniform remap table. */ + GLuint NumSubroutineUniforms; /* non-sparse total */ GLuint NumSubroutineUniformRemapTable; struct gl_uniform_storage **SubroutineUniformRemapTable; diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 47666d8..7909767 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2368,7 +2368,7 @@ _mesa_GetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, return; } - if (index >= sh->NumSubroutineUniformTypes) { + if (index >= sh->NumSubroutineUniforms) { _mesa_error(ctx, GL_INVALID_VALUE, "%s: invalid index greater than GL_ACTIVE_SUBROUTINE_UNIFORMS", api_name); return; } @@ -2672,7 +2672,7 @@ _mesa_GetProgramStageiv(GLuint program, GLenum shadertype, values[0] = sh->NumSubroutineUniformRemapTable; break; case GL_ACTIVE_SUBROUTINE_UNIFORMS: - values[0] = sh->NumSubroutineUniformTypes; + values[0] = sh->NumSubroutineUniforms; break; case GL_ACTIVE_SUBROUTINE_MAX_LENGTH: { -- 2.5.5 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
