aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/shaderapi.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-29 15:02:10 +0200
committermarha <marha@users.sourceforge.net>2011-05-29 15:02:10 +0200
commit1ccf18dc09e288ddf937aa890b50c8d0a9df4319 (patch)
treea08f093a56109dd213582d26534b7ead87e86695 /mesalib/src/mesa/main/shaderapi.c
parent741ef6e15af761d44ca0d8d54f6b99c33dd1b6bd (diff)
downloadvcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.tar.gz
vcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.tar.bz2
vcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.zip
libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011
Diffstat (limited to 'mesalib/src/mesa/main/shaderapi.c')
-rw-r--r--mesalib/src/mesa/main/shaderapi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 514eed5d0..03155b7ac 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1519,7 +1519,8 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
for (i = 0; i < count; i++) {
if (string[i] == NULL) {
free((GLvoid *) offsets);
- _mesa_error(ctx, GL_INVALID_OPERATION, "glShaderSourceARB(null string)");
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glShaderSourceARB(null string)");
return;
}
if (length == NULL || length[i] < 0)
@@ -1570,7 +1571,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
free(source);
source = newSource;
}
- }
+ }
shader_source(ctx, shaderObj, source);
@@ -1709,8 +1710,7 @@ _mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat,
#if FEATURE_ARB_geometry_shader4
void GLAPIENTRY
-_mesa_ProgramParameteriARB(GLuint program, GLenum pname,
- GLint value)
+_mesa_ProgramParameteriARB(GLuint program, GLenum pname, GLint value)
{
struct gl_shader_program *shProg;
GET_CURRENT_CONTEXT(ctx);