diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
| commit | e2c8d047679db3bbb166d709b86e18180be6d713 (patch) | |
| tree | d7468ac76dc71bb8d38c816be6db988bcbcbb863 /mesalib/src/mesa/swrast/s_fragprog.c | |
| parent | 57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (diff) | |
| parent | 7730393619080086530e24d3b594351b4114f608 (diff) | |
| download | vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.gz vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.bz2 vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/swrast/s_fragprog.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_fragprog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/swrast/s_fragprog.c b/mesalib/src/mesa/swrast/s_fragprog.c index 2608d5373..ab411a2f0 100644 --- a/mesalib/src/mesa/swrast/s_fragprog.c +++ b/mesalib/src/mesa/swrast/s_fragprog.c @@ -71,7 +71,7 @@ fetch_texel_lod( struct gl_context *ctx, const GLfloat texcoord[4], GLfloat lamb SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLfloat rgba[4];
- lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
+ lambda = CLAMP(lambda, texObj->Sampler.MinLod, texObj->Sampler.MaxLod);
swrast->TextureSample[unit](ctx, texObj, 1,
(const GLfloat (*)[4]) texcoord,
@@ -115,9 +115,9 @@ fetch_texel_deriv( struct gl_context *ctx, const GLfloat texcoord[4], texcoord[0], texcoord[1], texcoord[3],
1.0F / texcoord[3]);
- lambda += lodBias + texUnit->LodBias + texObj->LodBias;
+ lambda += lodBias + texUnit->LodBias + texObj->Sampler.LodBias;
- lambda = CLAMP(lambda, texObj->MinLod, texObj->MaxLod);
+ lambda = CLAMP(lambda, texObj->Sampler.MinLod, texObj->Sampler.MaxLod);
swrast->TextureSample[unit](ctx, texObj, 1,
(const GLfloat (*)[4]) texcoord,
|