1 files changed, 47 insertions, 42 deletions

diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c
index 41c07a3188..9f300e0d95 100644
--- a/src/mesa/drivers/dri/r300/r300_shader.c
+++ b/src/mesa/drivers/dri/r300/r300_shader.c
@@ -8,81 +8,86 @@
 #include "r300_fragprog.h"
 
 static void
-r300BindProgram(GLcontext *ctx, GLenum target, struct gl_program *prog)
+r300BindProgram(GLcontext * ctx, GLenum target, struct gl_program *prog)
 {
-	switch(target){
-		case GL_VERTEX_PROGRAM_ARB:
-		case GL_FRAGMENT_PROGRAM_ARB:
+	switch (target) {
+	case GL_VERTEX_PROGRAM_ARB:
+	case GL_FRAGMENT_PROGRAM_ARB:
 		break;
-		default:
-			WARN_ONCE("Target not supported yet!\n");
+	default:
+		WARN_ONCE("Target not supported yet!\n");
 		break;
 	}
 }
 
-static struct gl_program *
-r300NewProgram(GLcontext *ctx, GLenum target, GLuint id)
+static struct gl_program *r300NewProgram(GLcontext * ctx, GLenum target,
+					 GLuint id)
 {
 	struct r300_vertex_program_cont *vp;
 	struct r300_fragment_program *fp;
-	
-	switch(target){
-		case GL_VERTEX_STATE_PROGRAM_NV:
-		case GL_VERTEX_PROGRAM_ARB:
-			vp=CALLOC_STRUCT(r300_vertex_program_cont);
-			return _mesa_init_vertex_program(ctx, &vp->mesa_program, target, id);
-		case GL_FRAGMENT_PROGRAM_ARB:
-			fp=CALLOC_STRUCT(r300_fragment_program);
-			fp->ctx = ctx;
-			return _mesa_init_fragment_program(ctx, &fp->mesa_program, target, id);
-		case GL_FRAGMENT_PROGRAM_NV:
-			fp=CALLOC_STRUCT(r300_fragment_program);
-			return _mesa_init_fragment_program(ctx, &fp->mesa_program, target, id);
-		default:
-			_mesa_problem(ctx, "Bad target in r300NewProgram");
+
+	switch (target) {
+	case GL_VERTEX_STATE_PROGRAM_NV:
+	case GL_VERTEX_PROGRAM_ARB:
+		vp = CALLOC_STRUCT(r300_vertex_program_cont);
+		return _mesa_init_vertex_program(ctx, &vp->mesa_program,
+						 target, id);
+	case GL_FRAGMENT_PROGRAM_ARB:
+		fp = CALLOC_STRUCT(r300_fragment_program);
+		fp->ctx = ctx;
+		return _mesa_init_fragment_program(ctx, &fp->mesa_program,
+						   target, id);
+	case GL_FRAGMENT_PROGRAM_NV:
+		fp = CALLOC_STRUCT(r300_fragment_program);
+		return _mesa_init_fragment_program(ctx, &fp->mesa_program,
+						   target, id);
+	default:
+		_mesa_problem(ctx, "Bad target in r300NewProgram");
 	}
-	
-	return NULL;	
+
+	return NULL;
 }
 
-static void
-r300DeleteProgram(GLcontext *ctx, struct gl_program *prog)
+static void r300DeleteProgram(GLcontext * ctx, struct gl_program *prog)
 {
 	_mesa_delete_program(ctx, prog);
 }
 
 static void
-r300ProgramStringNotify(GLcontext *ctx, GLenum target, struct gl_program *prog)
+r300ProgramStringNotify(GLcontext * ctx, GLenum target,
+			struct gl_program *prog)
 {
-	struct r300_vertex_program_cont *vp=(void *)prog;
-	struct r300_fragment_program *fp = (struct r300_fragment_program *) prog;
-	
-	switch(target) {
+	struct r300_vertex_program_cont *vp = (void *)prog;
+	struct r300_fragment_program *fp =
+	    (struct r300_fragment_program *)prog;
+
+	switch (target) {
 	case GL_VERTEX_PROGRAM_ARB:
 		vp->progs = NULL;
 		/*vp->translated = GL_FALSE;
-		memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct gl_vertex_program));*/
-		/*r300_translate_vertex_shader(vp);*/
-	break;
+		   memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct gl_vertex_program)); */
+		/*r300_translate_vertex_shader(vp); */
+		break;
 	case GL_FRAGMENT_PROGRAM_ARB:
 		fp->translated = GL_FALSE;
-	break;
+		break;
 	}
 	/* need this for tcl fallbacks */
 	_tnl_program_string(ctx, target, prog);
 }
 
 static GLboolean
-r300IsProgramNative(GLcontext *ctx, GLenum target, struct gl_program *prog)
+r300IsProgramNative(GLcontext * ctx, GLenum target,
+		    struct gl_program *prog)
 {
 	return 1;
 }
 
 void r300InitShaderFuncs(struct dd_function_table *functions)
 {
-	functions->NewProgram=r300NewProgram;
-	functions->BindProgram=r300BindProgram;
-	functions->DeleteProgram=r300DeleteProgram;
-	functions->ProgramStringNotify=r300ProgramStringNotify;
-	functions->IsProgramNative=r300IsProgramNative;
+	functions->NewProgram = r300NewProgram;
+	functions->BindProgram = r300BindProgram;
+	functions->DeleteProgram = r300DeleteProgram;
+	functions->ProgramStringNotify = r300ProgramStringNotify;
+	functions->IsProgramNative = r300IsProgramNative;
 }