r300/compiler: Adapt AllocateHwInputs interface to common usage pattern

[mesa.git] / src / mesa / drivers / dri / r300 / r300_fragprog_common.c

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index 3bfe8a9dedee62468a95a7ad1262fd8f7050ea79..6674efc5bcaa8d89d6da6c5b7ee9e30ec26e67f4 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -154,9 +154,11 @@ static void rewriteFog(struct r300_fragment_program_compiler *compiler, struct r
  * @note This allocation is performed explicitly, because the order of inputs
  * is determined by the RS hardware.
  */
-static void allocate_hw_inputs(void * yourdata, void (*allocate)(void * data, unsigned input, unsigned hwreg), void * mydata)
+static void allocate_hw_inputs(
+       struct r300_fragment_program_compiler * c,
+       void (*allocate)(void * data, unsigned input, unsigned hwreg),
+       void * mydata)
 {
-       struct r300_fragment_program_compiler * c = yourdata;
        GLuint InputsRead = c->Base.Program.InputsRead;
        int i;
        GLuint hwindex = 0;
@@ -208,7 +210,6 @@ static void translate_fragment_program(GLcontext *ctx, struct r300_fragment_prog
        compiler.OutputDepth = FRAG_RESULT_DEPTH;
        compiler.OutputColor = FRAG_RESULT_COLOR;
        compiler.AllocateHwInputs = &allocate_hw_inputs;
-       compiler.UserData = &compiler;
 
        if (compiler.Base.Debug) {
                fflush(stdout);