From 585eebdd0f5e6cd792ea080a05d7d4570b39c23d Mon Sep 17 00:00:00 2001
From: Gert Wollny <gert.wollny@collabora.com>
Date: Sat, 6 Mar 2021 16:06:47 +0100
Subject: [PATCH] r600/sfn: Fix including/not including c++ parts of header

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9584>
---
 src/gallium/drivers/r600/sfn/sfn_nir.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.h b/src/gallium/drivers/r600/sfn/sfn_nir.h
index 22d00a48816..7c30937ff81 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.h
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.h
@@ -120,8 +120,6 @@ private:
 
 }
 
-#endif
-
 static inline nir_ssa_def *
 r600_imm_ivec3(nir_builder *build, int x, int y, int z)
 {
@@ -138,6 +136,10 @@ bool r600_lower_tess_io(nir_shader *shader, enum pipe_prim_type prim_type);
 bool r600_append_tcs_TF_emission(nir_shader *shader, enum pipe_prim_type prim_type);
 bool r600_lower_tess_coord(nir_shader *sh, enum pipe_prim_type prim_type);
 
+#else
+#include "gallium/drivers/r600/r600_shader.h"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif