diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-08 16:41:27 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-08 16:41:27 +0100 |
| commit | 03346747e21e4cd1db30c6a5d8af6705575e3755 (patch) | |
| tree | 120604af21bdac64007a0a3005dcce420cb76714 /mesalib/src/mesa/state_tracker | |
| parent | ada3d2c30b5a7a1a79e128b7326d50c3bab77a8a (diff) | |
| download | vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.tar.gz vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.tar.bz2 vcxsrv-03346747e21e4cd1db30c6a5d8af6705575e3755.zip | |
mesa git update 8 feb 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_sampler.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_texture.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c index ad159c64d..8845fed51 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c +++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c @@ -201,6 +201,8 @@ update_vertex_samplers(struct st_context *st) struct gl_vertex_program *vprog = ctx->VertexProgram._Current; GLuint su; + if (st->state.num_vertex_samplers == 0 && vprog->Base.SamplersUsed == 0) + return; st->state.num_vertex_samplers = 0; /* loop over sampler units (aka tex image units) */ diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c index 88e6128c8..d241527cc 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_texture.c +++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c @@ -260,6 +260,9 @@ update_vertex_textures(struct st_context *st) struct gl_vertex_program *vprog = ctx->VertexProgram._Current; GLuint su; + if (!vprog->Base.SamplersUsed && st->state.num_vertex_textures == 0) + return; + st->state.num_vertex_textures = 0; /* loop over sampler units (aka tex image units) */ |