Ping.

-Brian

On 04/24/2014 03:29 PM, Brian Paul wrote:
The original GL_EXT_texture_swizzle extensions said GL_INVALID_OPERATION
was to be generated when the an invalid swizzle was passed to
glTexParameter().  But in OpenGL 3.3 and later, the error should be
GL_INVALID_ENUM.
---
  src/mesa/main/texparam.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 40790ff..dc17ea5 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -485,7 +485,7 @@ set_tex_parameteri(struct gl_context *ctx,
           const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
           const GLint swz = comp_to_swizzle(params[0]);
           if (swz < 0) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
+            _mesa_error(ctx, GL_INVALID_ENUM,
                          "glTexParameter(swizzle 0x%x)", params[0]);
              return GL_FALSE;
           }
@@ -510,7 +510,7 @@ set_tex_parameteri(struct gl_context *ctx,
                 set_swizzle_component(&texObj->_Swizzle, comp, swz);
              }
              else {
-               _mesa_error(ctx, GL_INVALID_OPERATION,
+               _mesa_error(ctx, GL_INVALID_ENUM,
                             "glTexParameter(swizzle 0x%x)", params[comp]);
                 return GL_FALSE;
              }


_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to