From: Gert Wollny <gert.wollny@collabora.com>
Date: Tue, 15 Nov 2022 11:03:22 +0000 (+0100)
Subject: r600/sfn: set finalize_nir after reading debug flags
X-Git-Tag: upstream/23.3.3~16839
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1a81db9ee18933334686679e2f64097b43ffcc1;p=platform%2Fupstream%2Fmesa.git

r600/sfn: set finalize_nir after reading debug flags

Fixes: a81c50a21447a95e05f73badf6e4e7bfe734f7a8 (upstream/main)
    r600/sfn: implement finalize_nir

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19755>
---

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;