From 8bab8f64220f7a5d66e232986d9b17d2bc72b15f Mon Sep 17 00:00:00 2001
From: Caio Oliveira <caio.oliveira@intel.com>
Date: Fri, 28 Jan 2022 13:23:21 -0800
Subject: [PATCH] compiler, intel: Add gl_shader_stage_is_mesh()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And replace the previous Intel-specific function.

Reviewed-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14823>
---
 src/compiler/shader_enums.h       | 7 +++++++
 src/intel/compiler/brw_compiler.h | 6 ------
 src/intel/compiler/brw_fs_nir.cpp | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h
index 9066e4c92a3..88fd8bec46f 100644
--- a/src/compiler/shader_enums.h
+++ b/src/compiler/shader_enums.h
@@ -72,6 +72,13 @@ gl_shader_stage_is_compute(gl_shader_stage stage)
    return stage == MESA_SHADER_COMPUTE || stage == MESA_SHADER_KERNEL;
 }
 
+static inline bool
+gl_shader_stage_is_mesh(gl_shader_stage stage)
+{
+   return stage == MESA_SHADER_TASK ||
+          stage == MESA_SHADER_MESH;
+}
+
 static inline bool
 gl_shader_stage_uses_workgroup(gl_shader_stage stage)
 {
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index 5476f0104b1..094b0ef69c4 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -137,12 +137,6 @@ brw_shader_stage_is_bindless(gl_shader_stage stage)
           stage <= MESA_SHADER_CALLABLE;
 }
 
-static inline bool
-brw_shader_stage_is_mesh(gl_shader_stage stage)
-{
-   return stage == MESA_SHADER_TASK || stage == MESA_SHADER_MESH;
-}
-
 /**
  * Program key structures.
  *
diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
index f1a635c4fd4..14067942ace 100644
--- a/src/intel/compiler/brw_fs_nir.cpp
+++ b/src/intel/compiler/brw_fs_nir.cpp
@@ -160,7 +160,7 @@ emit_system_values_block(nir_block *block, fs_visitor *v)
          /* For Task/Mesh, draw_id will be handled later in
           * nir_emit_mesh_task_intrinsic().
           */
-         if (!brw_shader_stage_is_mesh(v->stage))
+         if (!gl_shader_stage_is_mesh(v->stage))
             unreachable("should be lowered by brw_nir_lower_vs_inputs().");
          break;