diff options
author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-07-29 19:41:07 +0200 |
---|---|---|
committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-07-29 21:15:00 +0200 |
commit | d3a1fc62f47f1a7f4422585c8c60bf8dcb0dfe4b (patch) | |
tree | 28087828d46ec6400353308e94330e51a23a9280 /src/mesa/drivers/dri/r300/r300_fragprog_common.c | |
parent | 88ebf514a41ae460dad08a4585a61541864a4432 (diff) |
r300/compiler: Adapt AllocateHwInputs interface to common usage pattern
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_fragprog_common.c')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_fragprog_common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c index 3bfe8a9ded..6674efc5bc 100644 --- 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); |