diff options
| author | Dave Airlie <[email protected]> | 2018-02-05 10:14:19 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2018-02-07 06:08:12 +1000 |
| commit | ab5cee4c241cb360cf67101dd751e0f38637b526 (patch) | |
| tree | 89a68d20dcc0dd4fd00387bea1ac68a9c87d1715 /src/gallium | |
| parent | 4e3b43f18046538171928256acefd01d97eed0ae (diff) | |
r600/compute: only mark buffer/image state dirty for fragment shaders
The compute emission path always emits this currently, and emitting
it on the fragment path breaks the blitter.
This fixes gpu hangs in KHR-GL45.compute_shader.resource-texture
Reviewed-by: Roland Scheidegger <[email protected]>
Cc: <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 90f05c06d3f..eb8eb376c2f 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -4060,7 +4060,8 @@ static void evergreen_set_shader_buffers(struct pipe_context *ctx, r600_mark_atom_dirty(rctx, &rctx->cb_misc_state.atom); } - r600_mark_atom_dirty(rctx, &istate->atom); + if (shader == PIPE_SHADER_FRAGMENT) + r600_mark_atom_dirty(rctx, &istate->atom); } static void evergreen_set_shader_images(struct pipe_context *ctx, @@ -4236,7 +4237,8 @@ static void evergreen_set_shader_images(struct pipe_context *ctx, r600_mark_atom_dirty(rctx, &rctx->cb_misc_state.atom); } - r600_mark_atom_dirty(rctx, &istate->atom); + if (shader == PIPE_SHADER_FRAGMENT) + r600_mark_atom_dirty(rctx, &istate->atom); } static void evergreen_get_pipe_constant_buffer(struct r600_context *rctx, |