[Mesa-dev] [PATCH 09/12] mesa/subroutines: don't generate error in GetSubroutineIndex.

Dave Airlie airlied at gmail.com
Mon May 23 00:52:39 UTC 2016


From: Dave Airlie <airlied at redhat.com>

GLSL spec says this doesn't generate an error.

Fixes:
GL45-CTS.explicit_uniform_location.subroutine-loc

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/mesa/main/shaderapi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 109171e..47666d8 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2324,7 +2324,6 @@ _mesa_GetSubroutineIndex(GLuint program, GLenum shadertype,
    resource_type = _mesa_shader_stage_to_subroutine(stage);
    res = _mesa_program_resource_find_name(shProg, resource_type, name, NULL);
    if (!res) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", api_name);
      return -1;
    }
 
-- 
2.5.5



More information about the mesa-dev mailing list