From 18b0a13e803d740e52f1205b690e30cd119bcf87 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 6 May 2016 11:37:06 +1000 Subject: [PATCH] glsl: produce a linker error for a subroutine uniform with no functions. If a subroutine uniform is declared with no functions backing it, that isn't legal, so we should fail to link. Fixes: GL43-CTS.shader_subroutine.subroutine_uniform_wo_matching_subroutines Reviewed-by: Chris Forbes Signed-off-by: Dave Airlie --- src/compiler/glsl/linker.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index de569453ee4..ef8db563bb2 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -3094,6 +3094,10 @@ link_calculate_subroutine_compat(struct gl_shader_program *prog) continue; count = 0; + if (sh->NumSubroutineFunctions == 0) { + linker_error(prog, "subroutine uniform %s defined but no valid functions found\n", uni->type->name); + continue; + } for (unsigned f = 0; f < sh->NumSubroutineFunctions; f++) { struct gl_subroutine_function *fn = &sh->SubroutineFunctions[f]; for (int k = 0; k < fn->num_compat_types; k++) { -- 2.30.2