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/state_tracker/st_atom_texture.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/state_tracker/st_atom_texture.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c index f27a320a5..fefa59860 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_texture.c +++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c @@ -147,7 +147,7 @@ st_create_texture_sampler_view_from_stobj(struct pipe_context *pipe, struct pipe_sampler_view templ; GLuint swizzle = apply_depthmode(stObj->pt->format, stObj->base._Swizzle, - samp->DepthMode); + stObj->base.DepthMode); u_sampler_view_default_template(&templ, stObj->pt, @@ -240,7 +240,7 @@ update_single_texture(struct st_context *st, if (stObj->sampler_view) { if (check_sampler_swizzle(stObj->sampler_view, stObj->base._Swizzle, - samp->DepthMode) || + stObj->base.DepthMode) || (st_view_format != stObj->sampler_view->format) || stObj->base.BaseLevel != stObj->sampler_view->u.tex.first_level) { pipe_sampler_view_reference(&stObj->sampler_view, NULL); |