Module: Mesa Branch: main Commit: bce19b3a779fd3526ef6368bc2fb180da23ba53e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bce19b3a779fd3526ef6368bc2fb180da23ba53e
Author: Ilia Mirkin <[email protected]> Date: Wed Aug 11 22:26:07 2021 -0400 mesa: don't return errors for gl_* GetFragData* queries There is nothing in the spec about this. BindFragDataLocation* is supposed to return an error, but not Get. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5221 Fixes: 59012c3133 ("mesa: Implement glGetFragDataLocation") Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12333> --- src/mesa/main/shader_query.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 8c44d3eaeba..00f9d423670 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -409,12 +409,6 @@ _mesa_GetFragDataIndex(GLuint program, const GLchar *name) if (!name) return -1; - if (strncmp(name, "gl_", 3) == 0) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glGetFragDataIndex(illegal name)"); - return -1; - } - /* Not having a fragment shader is not an error. */ if (shProg->_LinkedShaders[MESA_SHADER_FRAGMENT] == NULL) @@ -444,12 +438,6 @@ _mesa_GetFragDataLocation(GLuint program, const GLchar *name) if (!name) return -1; - if (strncmp(name, "gl_", 3) == 0) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "glGetFragDataLocation(illegal name)"); - return -1; - } - /* Not having a fragment shader is not an error. */ if (shProg->_LinkedShaders[MESA_SHADER_FRAGMENT] == NULL)
