fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600: amend space check for chips older than EVERGREEN

Browse source 
evergreen_emit_atomic_buffer_setup_count is only called if chip >= EVERGREEN
otherwise atomic_used_mask is left uninitialized when unconditionally used by
r600_need_cs_space so it might want more space than needed

fix this by always initializing atomic_used_mask

Fixes: 32529e6084 ("r600/eg: rework atomic counter emission with flushes")
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7417>
(cherry picked from commit 7ae81d65a4)
This commit is contained in:
Igor V. Kovalenko 2020-11-03 09:19:06 +03:00 • committed by Dylan Baker
parent f710a35e30
commit e21a96791c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4837,7 +4837,7 @@
"description": "r600: amend space check for chips older than EVERGREEN",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "32529e60849dd20d167f14cb8542c5798343f0e0"
},

2
src/gallium/drivers/r600/r600_state_common.c
View file

@ -2062,7 +2062,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info
unsigned index_size = info->index_size;
int index_bias;
struct r600_shader_atomic combined_atomics[8];
uint8_t atomic_used_mask;
uint8_t atomic_used_mask = 0;
if (!info->indirect && !info->count && (index_size || !info->count_from_stream_output)) {
return;