From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 2 Jul 2008 23:08:09 +0000 (-0600)
Subject: mesa: fix error codes in _mesa_shader_source(), _mesa_get_shader_source()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=088c42c5c3cb34bac98fce95e4f3d08642834112;p=mesa.git

mesa: fix error codes in _mesa_shader_source(), _mesa_get_shader_source()

If the 'shader' parameter is wrong, need to either generate GL_INVALID_VALUE
or GL_INVALID_OPERATION.  It depends on whether 'shader' actually names a
'program' or is a totally unknown ID.
There might be other cases to fix...

cherry-picked from master
---

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index a005c902e19..26d0b3d4760 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -875,7 +875,12 @@ _mesa_get_shader_source(GLcontext *ctx, GLuint shader, GLsizei maxLength,
 {
    struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);
    if (!sh) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGetShaderSource(shader)");
+      GLenum err;
+      if (_mesa_lookup_shader_program(ctx, shader))
+         err = GL_INVALID_OPERATION;
+      else
+         err = GL_INVALID_VALUE;
+      _mesa_error(ctx, err, "glGetShaderSource(shader)");
       return;
    }
    copy_string(sourceOut, maxLength, length, sh->Source);
@@ -966,7 +971,12 @@ _mesa_shader_source(GLcontext *ctx, GLuint shader, const GLchar *source)
 {
    struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);
    if (!sh) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSource(shaderObj)");
+      GLenum err;
+      if (_mesa_lookup_shader_program(ctx, shader))
+         err = GL_INVALID_OPERATION;
+      else
+         err = GL_INVALID_VALUE;
+      _mesa_error(ctx, err, "glShaderSource(shaderObj)");
       return;
    }