From: Dave Airlie <airlied@redhat.com>
Date: Tue, 17 May 2016 04:20:00 +0000 (+1000)
Subject: mesa/subroutines: don't generate error in GetSubroutineIndex.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22db9b10ebd46c777a87da890f5089ad24686441;p=mesa.git

mesa/subroutines: don't generate error in GetSubroutineIndex.

GLSL spec says this doesn't generate an error.

Fixes:
GL45-CTS.explicit_uniform_location.subroutine-loc

Reviewed-by: Chris Forbes <chrisforbes@google.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 109171ef57a..47666d83ded 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;
    }