diff options
author | michal <michal@transistor.(none)> | 2009-12-10 09:23:15 +0100 |
---|---|---|
committer | michal <michal@transistor.(none)> | 2009-12-10 09:23:15 +0100 |
commit | 1fb440beb9cccbe6f4bbd309792a89f6e1b4ee3f (patch) | |
tree | f52ba938b7ace2a1fe3caeb20d3c79349e5df7d9 /src/gallium/drivers/llvmpipe/lp_state_derived.c | |
parent | 3710a6f6cc84f46b6e1fb6a6a9f9eb6e7047c4e0 (diff) | |
download | external_mesa3d-1fb440beb9cccbe6f4bbd309792a89f6e1b4ee3f.zip external_mesa3d-1fb440beb9cccbe6f4bbd309792a89f6e1b4ee3f.tar.gz external_mesa3d-1fb440beb9cccbe6f4bbd309792a89f6e1b4ee3f.tar.bz2 |
llvmpipe: Fix after sampler view changes.
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_state_derived.c')
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_derived.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_state_derived.c b/src/gallium/drivers/llvmpipe/lp_state_derived.c index bdd906e..9c91ce9 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_derived.c +++ b/src/gallium/drivers/llvmpipe/lp_state_derived.c @@ -150,7 +150,7 @@ void llvmpipe_update_derived( struct llvmpipe_context *llvmpipe ) */ if (llvmpipe->tex_timestamp != lp_screen->timestamp) { llvmpipe->tex_timestamp = lp_screen->timestamp; - llvmpipe->dirty |= LP_NEW_TEXTURE; + llvmpipe->dirty |= LP_NEW_SAMPLER_VIEW; } if (llvmpipe->dirty & (LP_NEW_RASTERIZER | @@ -164,7 +164,7 @@ void llvmpipe_update_derived( struct llvmpipe_context *llvmpipe ) LP_NEW_DEPTH_STENCIL_ALPHA | LP_NEW_RASTERIZER | LP_NEW_SAMPLER | - LP_NEW_TEXTURE)) + LP_NEW_SAMPLER_VIEW)) llvmpipe_update_fs( llvmpipe ); if (llvmpipe->dirty & LP_NEW_BLEND_COLOR) @@ -182,10 +182,10 @@ void llvmpipe_update_derived( struct llvmpipe_context *llvmpipe ) lp_setup_set_fs_constants(llvmpipe->setup, llvmpipe->constants[PIPE_SHADER_FRAGMENT]); - if (llvmpipe->dirty & LP_NEW_TEXTURE) - lp_setup_set_sampler_textures(llvmpipe->setup, - llvmpipe->num_textures, - llvmpipe->texture); + if (llvmpipe->dirty & LP_NEW_SAMPLER_VIEW) + lp_setup_set_fragment_sampler_views(llvmpipe->setup, + llvmpipe->num_fragment_sampler_views, + llvmpipe->fragment_sampler_views); llvmpipe->dirty = 0; } |