summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-11-22 18:29:43 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-11-22 18:29:43 +0000
commit4774cd9568b42e780f9694b7720dfdd8c9b23819 (patch)
tree65c94ffe5ff55f8dc96dacc09aa953d0f63dd46b
parent96ad2cde2c03bc0fe352b473e61f6e97a2baedbc (diff)
pass ctx to fetch_vector4_deriv()
-rw-r--r--src/mesa/swrast/s_nvfragprog.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c
index 919ffbe799..f34829e4f1 100644
--- a/src/mesa/swrast/s_nvfragprog.c
+++ b/src/mesa/swrast/s_nvfragprog.c
@@ -181,7 +181,8 @@ fetch_vector4( GLcontext *ctx,
* need to execute another instance of the program (ugh)!
*/
static GLboolean
-fetch_vector4_deriv( const struct fp_src_register *source,
+fetch_vector4_deriv( GLcontext *ctx,
+ const struct fp_src_register *source,
const struct sw_span *span,
char xOrY, GLint column, GLfloat result[4] )
{
@@ -640,7 +641,8 @@ execute_program( GLcontext *ctx,
{
GLfloat a[4], aNext[4], result[4];
struct fp_machine dMachine;
- if (!fetch_vector4_deriv(&inst->SrcReg[0], span, 'X', column, result)) {
+ if (!fetch_vector4_deriv(ctx, &inst->SrcReg[0], span, 'X',
+ column, result)) {
/* This is tricky. Make a copy of the current machine state,
* increment the input registers by the dx or dy partial
* derivatives, then re-execute the program up to the
@@ -665,7 +667,8 @@ execute_program( GLcontext *ctx,
{
GLfloat a[4], aNext[4], result[4];
struct fp_machine dMachine;
- if (!fetch_vector4_deriv(&inst->SrcReg[0], span, 'Y', column, result)) {
+ if (!fetch_vector4_deriv(ctx, &inst->SrcReg[0], span, 'Y',
+ column, result)) {
init_machine_deriv(ctx, machine, program, span,
'Y', &dMachine);
fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a);