glsl2: Use Elements from main/compiler.h instead of open-coding

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index 12e6909a28759b7045707f0d99d65fa542d93297..1d9a58a5caf0d64d36b5d283af2926790625c7a7 100644 (file)
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -23,6 +23,7 @@
  */
 
 #include <stdio.h>
+#include "main/compiler.h"
 #include "glsl_parser_extras.h"
 #include "ir_reader.h"
 #include "program.h"
@@ -4799,10 +4800,6 @@ static const char *functions_for_EXT_texture_array_fs [] = {
    builtins_EXT_texture_array_fs_textures,
 };
 
-#ifndef Elements
-#define Elements(x) (sizeof(x)/sizeof(*(x)))
-#endif
-
 void *builtin_mem_ctx = NULL;
 
 void

diff --git a/src/glsl/builtin_types.h b/src/glsl/builtin_types.h
index bfa4f3f5408f75690deee85070cc21bb3127e9fd..7b94aac666b136e4e2cc8f3b52bd1754f7d21577 100644 (file)
--- a/src/glsl/builtin_types.h
+++ b/src/glsl/builtin_types.h
@@ -21,10 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef Elements
-#define Elements(x) (sizeof(x)/sizeof(*(x)))
-#endif
-
 const glsl_type glsl_type::_error_type =
    glsl_type(GL_INVALID_ENUM, GLSL_TYPE_ERROR, 0, 0, "");
 

diff --git a/src/glsl/builtins/tools/generate_builtins.pl b/src/glsl/builtins/tools/generate_builtins.pl
index 61d511da1d49fa164ea7bacb35117f1e4b05f005..91ef8917b0ae6da55661030c83e88fa72c8dfca2 100755 (executable)
--- a/src/glsl/builtins/tools/generate_builtins.pl
+++ b/src/glsl/builtins/tools/generate_builtins.pl
@@ -62,6 +62,7 @@ print << 'EOF';
  */
 
 #include <stdio.h>
+#include "main/compiler.h"
 #include "glsl_parser_extras.h"
 #include "ir_reader.h"
 #include "program.h"
@@ -110,10 +111,6 @@ foreach $version (@versions) {
 }
 
 print << 'EOF';
-#ifndef Elements
-#define Elements(x) (sizeof(x)/sizeof(*(x)))
-#endif
-
 void *builtin_mem_ctx = NULL;
 
 void

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 2aba1e0ac1d4392862b7a647bf9f5e5ae388327b..8e80cf99e96443d12f3688573f3fb70ad051c5b4 100644 (file)
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -23,6 +23,7 @@
 
 #include <cstdio>
 #include <stdlib.h>
+#include "main/compiler.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "glsl_types.h"

diff --git a/src/glsl/ir_variable.cpp b/src/glsl/ir_variable.cpp
index d88cb515b470f8efba94160a7de262d233ea5fc2..917c06743b45b8046b0396db0d17c7abaf6cb654 100644 (file)
--- a/src/glsl/ir_variable.cpp
+++ b/src/glsl/ir_variable.cpp
@@ -21,15 +21,12 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "main/compiler.h"
 #include "ir.h"
 #include "glsl_parser_extras.h"
 #include "glsl_symbol_table.h"
 #include "builtin_variables.h"
 
-#ifndef Elements
-#define Elements(x) (sizeof(x)/sizeof(*(x)))
-#endif
-
 static void generate_ARB_draw_buffers_variables(exec_list *,
                                                struct _mesa_glsl_parse_state *,
                                                bool, _mesa_glsl_parser_targets);

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index a9a6f977c013734156f3992c6906963a7631889d..ecb13069cb7a3c342c737abfe3d99dcb6082d1b3 100644 (file)
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -31,6 +31,7 @@
  */
 
 #include <stdio.h>
+#include "main/compiler.h"
 #include "ir.h"
 #include "ir_visitor.h"
 #include "ir_print_visitor.h"