From f9860a84b3cf1735ece78bc5907b2be4e2878f8e Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Sun, 4 Jun 2023 13:52:55 +0800
Subject: [PATCH] compiler: Combine duplicated implementation of
 is_gl_identifier into glsl_types.h

As glsl_types.cpp also called is_gl_identifier, so move it into glsl_types.h,
this will help the decouple glsl_types.h from src/compiler/glsl/*

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23420>
---
 src/compiler/glsl/gl_nir_link_uniforms.c             | 9 ---------
 src/compiler/glsl/gl_nir_link_varyings.c             | 9 ---------
 src/compiler/glsl/gl_nir_linker.c                    | 9 ---------
 src/compiler/glsl/gl_nir_opt_dead_builtin_varyings.c | 9 ---------
 src/compiler/glsl/ir.h                               | 9 ---------
 src/compiler/glsl_types.h                            | 9 +++++++++
 6 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c
index 83054469d3a..1af799b5cdf 100644
--- a/src/compiler/glsl/gl_nir_link_uniforms.c
+++ b/src/compiler/glsl/gl_nir_link_uniforms.c
@@ -46,15 +46,6 @@ struct uniform_array_info {
    BITSET_WORD *indices;
 };
 
-/**
- * Built-in / reserved GL variables names start with "gl_"
- */
-static inline bool
-is_gl_identifier(const char *s)
-{
-   return s && s[0] == 'g' && s[1] == 'l' && s[2] == '_';
-}
-
 static unsigned
 uniform_storage_size(const struct glsl_type *type)
 {
diff --git a/src/compiler/glsl/gl_nir_link_varyings.c b/src/compiler/glsl/gl_nir_link_varyings.c
index 2f2722c6ca4..fe9eece4433 100644
--- a/src/compiler/glsl/gl_nir_link_varyings.c
+++ b/src/compiler/glsl/gl_nir_link_varyings.c
@@ -1258,15 +1258,6 @@ varying_matches_compute_packing_order(const nir_variable *var)
    }
 }
 
-/**
- * Built-in / reserved GL variables names start with "gl_"
- */
-static bool
-is_gl_identifier(const char *s)
-{
-   return s && s[0] == 'g' && s[1] == 'l' && s[2] == '_';
-}
-
 /**
  * Record the given producer/consumer variable pair in the list of variables
  * that should later be assigned locations.
diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c
index 92debe1cd1c..1d77b3b3e27 100644
--- a/src/compiler/glsl/gl_nir_linker.c
+++ b/src/compiler/glsl/gl_nir_linker.c
@@ -198,15 +198,6 @@ can_remove_uniform(nir_variable *var, UNUSED void *data)
    return true;
 }
 
-/**
- * Built-in / reserved GL variables names start with "gl_"
- */
-static inline bool
-is_gl_identifier(const char *s)
-{
-   return s && s[0] == 'g' && s[1] == 'l' && s[2] == '_';
-}
-
 static bool
 inout_has_same_location(const nir_variable *var, unsigned stage)
 {
diff --git a/src/compiler/glsl/gl_nir_opt_dead_builtin_varyings.c b/src/compiler/glsl/gl_nir_opt_dead_builtin_varyings.c
index 09d2bdabe70..3d6991b38b8 100644
--- a/src/compiler/glsl/gl_nir_opt_dead_builtin_varyings.c
+++ b/src/compiler/glsl/gl_nir_opt_dead_builtin_varyings.c
@@ -92,15 +92,6 @@ initialise_varying_info(struct varying_info *info, nir_variable_mode mode,
    memset(info->backcolor, 0, sizeof(info->backcolor));
 }
 
-/**
- * Built-in / reserved GL variables names start with "gl_"
- */
-static bool
-is_gl_identifier(const char *s)
-{
-   return s && s[0] == 'g' && s[1] == 'l' && s[2] == '_';
-}
-
 static void
 gather_info_on_varying_deref(struct varying_info *info, nir_deref_instr *deref)
 {
diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h
index 41b81adf1a2..d3b83f5d2e4 100644
--- a/src/compiler/glsl/ir.h
+++ b/src/compiler/glsl/ir.h
@@ -2489,15 +2489,6 @@ prototype_string(const glsl_type *return_type, const char *name,
 const char *
 mode_string(const ir_variable *var);
 
-/**
- * Built-in / reserved GL variables names start with "gl_"
- */
-static inline bool
-is_gl_identifier(const char *s)
-{
-   return s && s[0] == 'g' && s[1] == 'l' && s[2] == '_';
-}
-
 extern "C" {
 #endif /* __cplusplus */
 
diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h
index 8f584705d43..9e0a444ceae 100644
--- a/src/compiler/glsl_types.h
+++ b/src/compiler/glsl_types.h
@@ -291,6 +291,15 @@ enum {
    GLSL_PRECISION_LOW
 };
 
+/**
+ * Built-in / reserved GL variables names start with "gl_"
+ */
+static inline bool
+is_gl_identifier(const char *s)
+{
+   return s && s[0] == 'g' && s[1] == 'l' && s[2] == '_';
+}
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif