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/main/ff_fragment_shader.cpp | |
| 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/main/ff_fragment_shader.cpp')
| -rw-r--r-- | mesalib/src/mesa/main/ff_fragment_shader.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp index 401e72c89..d4f7f2970 100644 --- a/mesalib/src/mesa/main/ff_fragment_shader.cpp +++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp @@ -439,9 +439,10 @@ static GLuint make_state_key( struct gl_context *ctx, struct state_key *key ) key->unit[i].source_index =
translate_tex_src_bit(texUnit->_ReallyEnabled);
- key->unit[i].shadow = ((texObj->CompareMode == GL_COMPARE_R_TO_TEXTURE) &&
- ((format == GL_DEPTH_COMPONENT) ||
- (format == GL_DEPTH_STENCIL_EXT)));
+ key->unit[i].shadow =
+ ((texObj->Sampler.CompareMode == GL_COMPARE_R_TO_TEXTURE) &&
+ ((format == GL_DEPTH_COMPONENT) ||
+ (format == GL_DEPTH_STENCIL_EXT)));
key->unit[i].NumArgsRGB = comb->_NumArgsRGB;
key->unit[i].NumArgsA = comb->_NumArgsA;
|