From: Nicolai Hähnle <nhaehnle@gmail.com>
Date: Thu, 16 Jul 2009 20:39:16 +0000 (+0200)
Subject: r300: Remove GLcontext requirement from radeonLocalTransform
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e93d70e3e93df956e89c46678020de1a352f9ecf;p=mesa.git

r300: Remove GLcontext requirement from radeonLocalTransform

Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
---

diff --git a/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c
index 8b8c957e5c4..daef20fe675 100644
--- a/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c
+++ b/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c
@@ -259,14 +259,14 @@ GLboolean r3xx_compile_fragment_program(struct r300_fragment_program_compiler* c
 			{ &radeonTransformDeriv, 0 },
 			{ &radeonTransformTrigScale, 0 }
 		};
-		radeonLocalTransform(c->ctx, c->program, 4, transformations);
+		radeonLocalTransform(c->program, 4, transformations);
 	} else {
 		struct radeon_program_transformation transformations[] = {
 			{ &r300_transform_TEX, c },
 			{ &radeonTransformALU, 0 },
 			{ &radeonTransformTrigSimple, 0 }
 		};
-		radeonLocalTransform(c->ctx, c->program, 3, transformations);
+		radeonLocalTransform(c->program, 3, transformations);
 	}
 
 	if (c->debug) {
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program.c b/src/mesa/drivers/dri/r300/compiler/radeon_program.c
index da5e7aefce5..0022d0a76ce 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program.c
@@ -46,7 +46,6 @@
  * one instruction at a time.
  */
 void radeonLocalTransform(
-	GLcontext *Ctx,
 	struct gl_program *program,
 	int num_transformations,
 	struct radeon_program_transformation* transformations)
@@ -54,7 +53,6 @@ void radeonLocalTransform(
 	struct radeon_transform_context ctx;
 	int ip;
 
-	ctx.Ctx = Ctx;
 	ctx.Program = program;
 	ctx.OldInstructions = program->Instructions;
 	ctx.OldNumInstructions = program->NumInstructions;
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program.h b/src/mesa/drivers/dri/r300/compiler/radeon_program.h
index 3d4dbfecf72..5b42883812a 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program.h
@@ -85,7 +85,6 @@ static inline GLuint combine_swizzles(GLuint src, GLuint swz)
  * e.g. finding new temporary registers must use @ref radeonFindFreeTemporary
  */
 struct radeon_transform_context {
-	GLcontext *Ctx;
 	struct gl_program *Program;
 	struct prog_instruction *OldInstructions;
 	GLuint OldNumInstructions;
@@ -110,7 +109,6 @@ struct radeon_program_transformation {
 };
 
 void radeonLocalTransform(
-	GLcontext* ctx,
 	struct gl_program *program,
 	int num_transformations,
 	struct radeon_program_transformation* transformations);