KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

draw: make sure pipeline is revalidated when sampler views or samplers change. 

Since with llvm execution parts of sampler view and sampler state is baked into
the shader, we need to revalidate otherwise the wrong shader might get used.
(Not completely sure but I think this would not be required for non-llvm case,
along with everything else in these functions.)
This caused bugs in piglit arb_texture_buffer_object-formats, because we never
noticed that the view format changed.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Roland Scheidegger 2013-02-23 01:16:54 +01:00
parent 20183177a5
commit c0ba1080df
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/auxiliary/draw/draw_context.c
View File

@ -764,6 +764,8 @@ draw_set_sampler_views(struct draw_context *draw,
debug_assert(shader_stage < PIPE_SHADER_TYPES);
debug_assert(num <= PIPE_MAX_SHADER_SAMPLER_VIEWS);
draw_do_flush( draw, DRAW_FLUSH_STATE_CHANGE );
for (i = 0; i < num; ++i)
draw->sampler_views[shader_stage][i] = views[i];
for (i = num; i < PIPE_MAX_SHADER_SAMPLER_VIEWS; ++i)
@ -783,6 +785,8 @@ draw_set_samplers(struct draw_context *draw,
debug_assert(shader_stage < PIPE_SHADER_TYPES);
debug_assert(num <= PIPE_MAX_SAMPLERS);
draw_do_flush( draw, DRAW_FLUSH_STATE_CHANGE );
for (i = 0; i < num; ++i)
draw->samplers[shader_stage][i] = samplers[i];
for (i = num; i < PIPE_MAX_SAMPLERS; ++i)

3
src/gallium/auxiliary/gallivm/lp_bld_sample.c
View File

@ -117,7 +117,8 @@ lp_sampler_static_texture_state(struct lp_static_texture_state *state,
state->level_zero_only = !view->u.tex.last_level;
/*
* FIXME: Handle the remainder of pipe_sampler_view.
* the layer / element / level parameters are all either dynamic
* state or handled transparently wrt execution.
*/
}