summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/llvmpipe/lp_state_derived.c
diff options
context:
space:
mode:
authorZack Rusin <zackr@vmware.com>2010-07-06 13:27:31 -0400
committerZack Rusin <zackr@vmware.com>2010-07-06 13:29:04 -0400
commit99c8d9b6dac55263b3f0ddce939173ec9a16cf80 (patch)
treec107706b5ab90b0d7a06de125f7418ff6f10c85a /src/gallium/drivers/llvmpipe/lp_state_derived.c
parentca88683459016d2cdc82175c718ee429e9440cf0 (diff)
llvmpipe: disconnect vertex texture sampling from the setup
it was wrong to put this in the fs paths, but it was easier to just stuff it along the fragment texture sampling paths. the patch disconnects vertex texture sampling and just maps the textures before the draw itself and unmaps them after.
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_state_derived.c')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_state_derived.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_state_derived.c b/src/gallium/drivers/llvmpipe/lp_state_derived.c
index 263b117494..77bec4640b 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_derived.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_derived.c
@@ -188,14 +188,10 @@ void llvmpipe_update_derived( struct llvmpipe_context *llvmpipe )
lp_setup_set_fs_constants(llvmpipe->setup,
llvmpipe->constants[PIPE_SHADER_FRAGMENT][0]);
- if (llvmpipe->dirty & LP_NEW_SAMPLER_VIEW) {
+ if (llvmpipe->dirty & LP_NEW_SAMPLER_VIEW)
lp_setup_set_fragment_sampler_views(llvmpipe->setup,
llvmpipe->num_fragment_sampler_views,
llvmpipe->fragment_sampler_views);
- lp_setup_set_vertex_sampler_views(llvmpipe->setup,
- llvmpipe->num_vertex_sampler_views,
- llvmpipe->vertex_sampler_views);
- }
llvmpipe->dirty = 0;
}