diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-16 04:16:48 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-16 04:16:48 +0000 |
| commit | aa8abf8081023c00469b6c88760ed0291033eb6e (patch) | |
| tree | f69848c418cd6b7c702bc5b1c2a21412c5e7a4dd /src/mesa/swrast/s_nvfragprog.c | |
| parent | 792a1bcbe4c4b4f5f96d6ac017fcb5376900ea75 (diff) | |
Rework the texture filtering functions a bit.
No need to pass the texture unit number as an argument.
Diffstat (limited to 'src/mesa/swrast/s_nvfragprog.c')
| -rw-r--r-- | src/mesa/swrast/s_nvfragprog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c index 5ec1ce078f..1f9ec448c2 100644 --- a/src/mesa/swrast/s_nvfragprog.c +++ b/src/mesa/swrast/s_nvfragprog.c @@ -55,7 +55,7 @@ fetch_texel( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda, SWcontext *swrast = SWRAST_CONTEXT(ctx); /* XXX use a float-valued TextureSample routine here!!! */ - swrast->TextureSample[unit](ctx, unit, ctx->Texture.Unit[unit]._Current, + swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current, 1, (const GLfloat (*)[4]) texcoord, &lambda, &rgba); color[0] = CHAN_TO_FLOAT(rgba[0]); @@ -88,7 +88,7 @@ fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4], texcoord[0], texcoord[1], texcoord[3], 1.0F / texcoord[3]); - swrast->TextureSample[unit](ctx, unit, ctx->Texture.Unit[unit]._Current, + swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current, 1, (const GLfloat (*)[4]) texcoord, &lambda, &rgba); color[0] = CHAN_TO_FLOAT(rgba[0]); |