diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-03 16:02:13 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-03 17:21:22 -0600 |
| commit | bb18a8b2eaaf8eea02c3255ed774751378fc7aa6 (patch) | |
| tree | 9f6513d90a2794c995d0ab56f2264c8bc5e7e4ab /src | |
| parent | d015ffa6ea20f00f23513e63b5c27e5e6d0d3627 (diff) | |
mesa: fix some error codes in _mesa_ShaderSourceARB()
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/shaders.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c index 7bf8808767..b7b2f791a5 100644 --- a/src/mesa/main/shaders.c +++ b/src/mesa/main/shaders.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 + * Version: 7.1 * - * Copyright (C) 2004-2007 Brian Paul All Rights Reserved. + * Copyright (C) 2004-2008 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -382,7 +382,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count, GLsizei i, totalLength; GLcharARB *source; - if (string == NULL) { + if (!shaderObj || string == NULL) { _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB"); return; } @@ -400,7 +400,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count, for (i = 0; i < count; i++) { if (string[i] == NULL) { _mesa_free((GLvoid *) offsets); - _mesa_error(ctx, GL_INVALID_VALUE, "glShaderSourceARB(null string)"); + _mesa_error(ctx, GL_INVALID_OPERATION, "glShaderSourceARB(null string)"); return; } if (length == NULL || length[i] < 0) |