From d1a81db9ee18933334686679e2f64097b43ffcc1 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Tue, 15 Nov 2022 12:03:22 +0100 Subject: [PATCH] r600/sfn: set finalize_nir after reading debug flags Fixes: a81c50a21447a95e05f73badf6e4e7bfe734f7a8 (upstream/main) r600/sfn: implement finalize_nir Signed-off-by: Gert Wollny Part-of: --- src/gallium/drivers/r600/r600_pipe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 41f4513..bd76162 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -703,9 +703,6 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws, rscreen->b.b.get_shader_param = r600_get_shader_param; rscreen->b.b.resource_create = r600_resource_create; - if (is_nir_enabled(&rscreen->b)) - rscreen->b.b.finalize_nir = r600_finalize_nir; - if (!r600_common_screen_init(&rscreen->b, ws)) { FREE(rscreen); return NULL; @@ -731,6 +728,9 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws, return NULL; } + if (is_nir_enabled(&rscreen->b)) + rscreen->b.b.finalize_nir = r600_finalize_nir; + rscreen->b.has_streamout = true; rscreen->has_msaa = true; -- 2.7.4