diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-17 10:54:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-17 10:54:15 +0200 |
| commit | 5d9b8cf0e4054e774f906cde9dd6b61ceca72d44 (patch) | |
| tree | 2a15e0622fdb009a0aac84019dce232a245f2e0b /mesalib/src/mesa/state_tracker/st_atom_sampler.c | |
| parent | 4aac32998c2b173b84aec0b020aa086fef4b1423 (diff) | |
| download | vcxsrv-5d9b8cf0e4054e774f906cde9dd6b61ceca72d44.tar.gz vcxsrv-5d9b8cf0e4054e774f906cde9dd6b61ceca72d44.tar.bz2 vcxsrv-5d9b8cf0e4054e774f906cde9dd6b61ceca72d44.zip | |
fontconfig mesa git update 17 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_sampler.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_sampler.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c index f39fd7551..adcc7b505 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c +++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c @@ -253,24 +253,24 @@ update_samplers(struct st_context *st) PIPE_SHADER_FRAGMENT, &ctx->FragmentProgram._Current->Base, ctx->Const.MaxTextureImageUnits, - st->state.fragment_samplers, - &st->state.num_fragment_samplers); + st->state.samplers[PIPE_SHADER_FRAGMENT], + &st->state.num_samplers[PIPE_SHADER_FRAGMENT]); update_shader_samplers(st, PIPE_SHADER_VERTEX, &ctx->VertexProgram._Current->Base, ctx->Const.MaxVertexTextureImageUnits, - st->state.vertex_samplers, - &st->state.num_vertex_samplers); - -/* - update_shader_samplers(st, - PIPE_SHADER_GEOMETRY, - &ctx->GeometryProgram._Current->Base, - ctx->Const.MaxGeometryTextureImageUnits, - st->state.geometry_samplers, - &st->state.num_geometry_samplers); -*/ + st->state.samplers[PIPE_SHADER_VERTEX], + &st->state.num_samplers[PIPE_SHADER_VERTEX]); + + if (ctx->GeometryProgram._Current) { + update_shader_samplers(st, + PIPE_SHADER_GEOMETRY, + &ctx->GeometryProgram._Current->Base, + ctx->Const.MaxGeometryTextureImageUnits, + st->state.samplers[PIPE_SHADER_GEOMETRY], + &st->state.num_samplers[PIPE_SHADER_GEOMETRY]); + } } |