Commit 261bbc01 authored by Ian Romanick's avatar Ian Romanick

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

parent 2d83e3fa
......@@ -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
......
......@@ -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, "");
......
......@@ -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
......
......@@ -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"
......
......@@ -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);
......
......@@ -31,6 +31,7 @@
*/
#include <stdio.h>
#include "main/compiler.h"
#include "ir.h"
#include "ir_visitor.h"
#include "ir_print_visitor.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment