Mesa (main): mesa: move _mesa_varying_slot_in_fs to shader_enums

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 244fa81c137f885e631ab02c1ee9157d02aea01a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=244fa81c137f885e631ab02c1ee9157d02aea01a

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec  7 16:24:29 2021 +1000

mesa: move _mesa_varying_slot_in_fs to shader_enums

This doesn't need anything from mtypes.h, just changes types
to non GL equivalents

Reviewed-by: Caio Oliveira <caio.oliveira at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14104>

---

 src/compiler/shader_enums.h | 23 +++++++++++++++++++++++
 src/mesa/main/mtypes.h      | 24 ------------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h
index b1e443f2594..a98d52743e4 100644
--- a/src/compiler/shader_enums.h
+++ b/src/compiler/shader_enums.h
@@ -417,6 +417,29 @@ typedef enum
 const char *gl_varying_slot_name_for_stage(gl_varying_slot slot,
                                            gl_shader_stage stage);
 
+/**
+ * Determine if the given gl_varying_slot appears in the fragment shader.
+ */
+static inline bool
+_mesa_varying_slot_in_fs(gl_varying_slot slot)
+{
+   switch (slot) {
+   case VARYING_SLOT_PSIZ:
+   case VARYING_SLOT_BFC0:
+   case VARYING_SLOT_BFC1:
+   case VARYING_SLOT_EDGE:
+   case VARYING_SLOT_CLIP_VERTEX:
+   case VARYING_SLOT_LAYER:
+   case VARYING_SLOT_TESS_LEVEL_OUTER:
+   case VARYING_SLOT_TESS_LEVEL_INNER:
+   case VARYING_SLOT_BOUNDING_BOX0:
+   case VARYING_SLOT_BOUNDING_BOX1:
+   case VARYING_SLOT_VIEWPORT_MASK:
+      return false;
+   default:
+      return true;
+   }
+}
 
 /**
  * Bitflags for varying slots.
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c86bb603bec..7813ac85d56 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -91,30 +91,6 @@ struct shader_includes;
 #define PRIM_OUTSIDE_BEGIN_END   (PRIM_MAX + 1)
 #define PRIM_UNKNOWN             (PRIM_MAX + 2)
 
-/**
- * Determine if the given gl_varying_slot appears in the fragment shader.
- */
-static inline GLboolean
-_mesa_varying_slot_in_fs(gl_varying_slot slot)
-{
-   switch (slot) {
-   case VARYING_SLOT_PSIZ:
-   case VARYING_SLOT_BFC0:
-   case VARYING_SLOT_BFC1:
-   case VARYING_SLOT_EDGE:
-   case VARYING_SLOT_CLIP_VERTEX:
-   case VARYING_SLOT_LAYER:
-   case VARYING_SLOT_TESS_LEVEL_OUTER:
-   case VARYING_SLOT_TESS_LEVEL_INNER:
-   case VARYING_SLOT_BOUNDING_BOX0:
-   case VARYING_SLOT_BOUNDING_BOX1:
-   case VARYING_SLOT_VIEWPORT_MASK:
-      return GL_FALSE;
-   default:
-      return GL_TRUE;
-   }
-}
-
 /**
  * Bit flags for all renderbuffers
  */