Mesa (master): compiler: move TEXTURE_COORD/VERTEX_GENERIC_ATTRIB limits into shader_enums.h

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e06cbff50e69f2c0178fcb710818dc0bf5fba463
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e06cbff50e69f2c0178fcb710818dc0bf5fba463

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Feb  7 19:57:09 2021 -0500

compiler: move TEXTURE_COORD/VERTEX_GENERIC_ATTRIB limits into shader_enums.h

because they are used there.

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9050>

---

 src/compiler/shader_enums.h | 8 ++++++++
 src/mesa/main/config.h      | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h
index 1af7f122efb..c44f4e32f62 100644
--- a/src/compiler/shader_enums.h
+++ b/src/compiler/shader_enums.h
@@ -166,6 +166,14 @@ typedef enum
 
 const char *gl_vert_attrib_name(gl_vert_attrib attrib);
 
+/**
+ * Max number of texture coordinate units.  This mainly just applies to
+ * the fixed-function vertex code.  This will be difficult to raise above
+ * eight because of various vertex attribute bitvectors.
+ */
+#define MAX_TEXTURE_COORD_UNITS     8
+#define MAX_VERTEX_GENERIC_ATTRIBS  16
+
 /**
  * Symbolic constats to help iterating over
  * specific blocks of vertex attributes.
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index e72e8d54c66..3571a338d58 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -105,13 +105,6 @@
  */
 #define MAX_ARRAY_TEXTURE_LAYERS 64
 
-/**
- * Max number of texture coordinate units.  This mainly just applies to
- * the fixed-function vertex code.  This will be difficult to raise above
- * eight because of various vertex attribute bitvectors.
- */
-#define MAX_TEXTURE_COORD_UNITS 8
-
 /**
  * Max number of texture image units.  Also determines number of texture
  * samplers in shaders.
@@ -213,7 +206,6 @@
 
 /** For GL_ARB_vertex_shader */
 /*@{*/
-#define MAX_VERTEX_GENERIC_ATTRIBS 16
 /* 6 is for vertex, hull, domain, geometry, fragment, and compute shader. */
 #define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_TEXTURE_IMAGE_UNITS * 6)
 /*@}*/