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

r600: fix r600_init_shader_caps() has_atomics issue

Browse source 
Indeed, has_atomics is not yet initialized at the time of the
call of r600_init_shader_caps(). This change fixes this issue.

For instance, this issue is triggered with
"piglit/bin/clearbuffer-depth-cs-probe -auto -fbo":
clearbuffer-depth-cs-probe: ../src/gallium/drivers/r600/evergreen_state.c:5039: evergreen_emit_atomic_buffer_setup: Assertion `resource' failed.
Aborted

Fixes: 7cd606f01b ("r600: add r600_init_screen_caps")
Signed-off-by: Patrick Lerda <patrick9876@free.fr>
Reviewed-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33438>
(cherry picked from commit bb44052ee9)
This commit is contained in:
Patrick Lerda 2025-02-06 18:19:02 +01:00 • committed by Eric Engestrom
parent b86196935f
commit 9fd4deead3
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -384,7 +384,7 @@
"description": "r600: fix r600_init_shader_caps() has_atomics issue",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "7cd606f01b999cde306539bdf38fbe24072f90c7",
"notes": null

7
src/gallium/drivers/r600/r600_pipe.c
View file

@ -625,8 +625,6 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws,
rscreen->has_msaa = true;
r600_init_screen_caps(rscreen);
/* MSAA support. */
switch (rscreen->b.gfx_level) {
case R600:
@ -653,10 +651,13 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws,
rscreen->global_pool = compute_memory_pool_new(rscreen);
rscreen->has_atomics = true;
r600_init_screen_caps(rscreen);
/* Create the auxiliary context. This must be done last. */
rscreen->b.aux_context = rscreen->b.b.context_create(&rscreen->b.b, NULL, 0);
rscreen->has_atomics = true;
#if 0 /* This is for testing whether aux_context and buffer clearing work correctly. */
struct pipe_resource templ = {};