fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 10:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris: fix set_sampler_views to not unbind, be better about bounds

Browse source
This commit is contained in:
Kenneth Graunke 2018-12-02 23:07:27 -08:00
parent 598ce8e88e
commit 1c6fea8e7b
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/iris/iris_state.c
View file

@ -1373,7 +1373,8 @@ iris_bind_sampler_states(struct pipe_context *ctx,
struct iris_shader_state *shs = &ice->state.shaders[stage];
assert(start + count <= IRIS_MAX_TEXTURE_SAMPLERS);
shs->num_samplers = MAX2(shs->num_samplers, start + count);
if (states)
shs->num_samplers = MAX2(shs->num_samplers, start + count);
for (int i = 0; i < count; i++) {
shs->samplers[start + i] = states[i];
@ -1759,20 +1760,16 @@ iris_set_sampler_views(struct pipe_context *ctx,
gl_shader_stage stage = stage_from_pipe(p_stage);
struct iris_shader_state *shs = &ice->state.shaders[stage];
unsigned i;
for (i = 0; i < count; i++) {
if (views)
shs->num_textures = MAX2(shs->num_textures, start + count);
for (unsigned i = 0; i < count; i++) {
pipe_sampler_view_reference((struct pipe_sampler_view **)
&shs->textures[i], views[i]);
struct iris_sampler_view *view = (void *) views[i];
if (view)
view->res->bind_history |= PIPE_BIND_SAMPLER_VIEW;
}
for (; i < shs->num_textures; i++) {
pipe_sampler_view_reference((struct pipe_sampler_view **)
&shs->textures[i], NULL);
}
shs->num_textures = count;
ice->state.dirty |= (IRIS_DIRTY_BINDINGS_VS << stage);
}