diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-03 08:16:19 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-03 09:35:02 +0200 |
| commit | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (patch) | |
| tree | a6124cc965bba51de50907418ce63ab4540f582d /mesalib/src/mesa/swrast/s_atifragshader.c | |
| parent | 49838240b7d4cff1ffed1bd91e495f6919061f90 (diff) | |
| download | vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.tar.gz vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.tar.bz2 vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.zip | |
pixman mesa git update 3 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/swrast/s_atifragshader.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_atifragshader.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/swrast/s_atifragshader.c b/mesalib/src/mesa/swrast/s_atifragshader.c index 1eb026e00..394fac50b 100644 --- a/mesalib/src/mesa/swrast/s_atifragshader.c +++ b/mesalib/src/mesa/swrast/s_atifragshader.c @@ -23,6 +23,7 @@ #include "main/colormac.h" #include "main/macros.h" #include "main/atifragshader.h" +#include "main/samplerobj.h" #include "swrast/s_atifragshader.h" #include "swrast/s_context.h" @@ -49,8 +50,9 @@ fetch_texel(struct gl_context * ctx, const GLfloat texcoord[4], GLfloat lambda, SWcontext *swrast = SWRAST_CONTEXT(ctx); /* XXX use a float-valued TextureSample routine here!!! */ - swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current, - 1, (const GLfloat(*)[4]) texcoord, + swrast->TextureSample[unit](ctx, _mesa_get_samplerobj(ctx, unit), + ctx->Texture.Unit[unit]._Current, + 1, (const GLfloat(*)[4]) texcoord, &lambda, (GLfloat (*)[4]) color); } |