AUTOMAKE_OPTIONS = foreign
bin_PROGRAMS = glsl
-glsl_SOURCES = symbol_table.c hash_table.c glsl_types.c \
+glsl_SOURCES = symbol_table.c hash_table.c glsl_types.cpp \
glsl_parser.ypp glsl_lexer.lpp glsl_parser_extras.cpp \
ast_expr.cpp ast_to_hir.cpp ir.cpp hir_field_selection.cpp
# gen_integral_type <name> <base_type> <vector elements> <matrix rows>
function gen_integral_type
{
- printf ' { %17s, 0, 0, 0, 0, %u, %u, "%s", 0, {NULL} },\n' $2 $3 $4 $1
+ printf ' glsl_type( %17s, %u, %u, "%s"),\n' $2 $3 $4 $1
index=$((index + 1))
}
function gen_struct_type
{
elements=$(printf "%s_fields" $1)
- printf ' {\n GLSL_TYPE_STRUCT, 0, 0, 0, 0, 0, 0, "%s",\n Elements(%s),\n {(void *) %s}\n },\n' \
- $1 $elements $elements
+ printf ' glsl_type(%s,\n Elements(%s),\n "%s"),\n' \
+ $elements $elements $1
}
# gen_sampler_type <name> <dimensions> <shadow> <array> <type>
name=$(printf "u%s" $name)
fi
- printf ' { GLSL_TYPE_SAMPLER, %21s, %u, %u, %15s, 0, 0,\n "%s", 0, {NULL} },\n' \
+ printf ' glsl_type(%21s, %u, %u, %15s, "%s"),\n' \
$2 $3 $4 $5 $name
}
#define Elements(x) (sizeof(x)/sizeof(*(x)))
#endif
-static const struct glsl_type error_type = {
- GLSL_TYPE_ERROR, 0, 0, 0, 0, 0, 0, "", 0, {NULL}
-};
+static const struct glsl_type error_type =
+ glsl_type(GLSL_TYPE_ERROR, 0, 0, "");
const struct glsl_type *const glsl_error_type = & error_type;
+++ /dev/null
-/*
- * Copyright © 2009 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include "symbol_table.h"
-#include "glsl_parser_extras.h"
-#include "glsl_types.h"
-#include "builtin_types.h"
-
-
-struct glsl_type *
-_mesa_glsl_array_type_ctor(struct glsl_type *base, unsigned length,
- const char *name)
-{
- struct glsl_type *type = calloc(1, sizeof(*type));
-
- type->base_type = GLSL_TYPE_ARRAY;
- type->name = name;
- type->length = length;
- type->fields.array = base;
-
- return type;
-}
-
-
-static void
-add_types_to_symbol_table(struct _mesa_symbol_table *symtab,
- const struct glsl_type *types,
- unsigned num_types)
-{
- unsigned i;
-
- for (i = 0; i < num_types; i++) {
- _mesa_symbol_table_add_symbol(symtab, 0, types[i].name,
- (void *) & types[i]);
- }
-}
-
-
-static void
-generate_110_types(struct _mesa_symbol_table *symtab)
-{
- add_types_to_symbol_table(symtab, builtin_core_types,
- Elements(builtin_core_types));
- add_types_to_symbol_table(symtab, builtin_structure_types,
- Elements(builtin_structure_types));
- add_types_to_symbol_table(symtab, builtin_110_deprecated_structure_types,
- Elements(builtin_110_deprecated_structure_types));
-}
-
-
-static void
-generate_120_types(struct _mesa_symbol_table *symtab)
-{
- generate_110_types(symtab);
-
- add_types_to_symbol_table(symtab, builtin_120_types,
- Elements(builtin_120_types));
-}
-
-
-static void
-generate_130_types(struct _mesa_symbol_table *symtab)
-{
- generate_120_types(symtab);
-
- add_types_to_symbol_table(symtab, builtin_130_types,
- Elements(builtin_130_types));
-}
-
-
-void
-_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
-{
- switch (state->language_version) {
- case 110:
- generate_110_types(state->symbols);
- break;
- case 120:
- generate_120_types(state->symbols);
- break;
- case 130:
- generate_130_types(state->symbols);
- break;
- default:
- /* error */
- break;
- }
-}
-
-
-const struct glsl_type *
-_mesa_glsl_get_vector_type(unsigned base_type, unsigned vector_length)
-{
- switch (base_type) {
- case GLSL_TYPE_UINT:
- switch (vector_length) {
- case 1:
- case 2:
- case 3:
- case 4:
- return glsl_uint_type + (vector_length - 1);
- default:
- return glsl_error_type;
- }
- case GLSL_TYPE_INT:
- switch (vector_length) {
- case 1:
- case 2:
- case 3:
- case 4:
- return glsl_int_type + (vector_length - 1);
- default:
- return glsl_error_type;
- }
- case GLSL_TYPE_FLOAT:
- switch (vector_length) {
- case 1:
- case 2:
- case 3:
- case 4:
- return glsl_float_type + (vector_length - 1);
- default:
- return glsl_error_type;
- }
- case GLSL_TYPE_BOOL:
- switch (vector_length) {
- case 1:
- case 2:
- case 3:
- case 4:
- return glsl_bool_type + (vector_length - 1);
- default:
- return glsl_error_type;
- }
- default:
- return glsl_error_type;
- }
-}
--- /dev/null
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include "symbol_table.h"
+#include "glsl_parser_extras.h"
+#include "glsl_types.h"
+#include "builtin_types.h"
+
+
+static void
+add_types_to_symbol_table(struct _mesa_symbol_table *symtab,
+ const struct glsl_type *types,
+ unsigned num_types)
+{
+ unsigned i;
+
+ for (i = 0; i < num_types; i++) {
+ _mesa_symbol_table_add_symbol(symtab, 0, types[i].name,
+ (void *) & types[i]);
+ }
+}
+
+
+static void
+generate_110_types(struct _mesa_symbol_table *symtab)
+{
+ add_types_to_symbol_table(symtab, builtin_core_types,
+ Elements(builtin_core_types));
+ add_types_to_symbol_table(symtab, builtin_structure_types,
+ Elements(builtin_structure_types));
+ add_types_to_symbol_table(symtab, builtin_110_deprecated_structure_types,
+ Elements(builtin_110_deprecated_structure_types));
+}
+
+
+static void
+generate_120_types(struct _mesa_symbol_table *symtab)
+{
+ generate_110_types(symtab);
+
+ add_types_to_symbol_table(symtab, builtin_120_types,
+ Elements(builtin_120_types));
+}
+
+
+static void
+generate_130_types(struct _mesa_symbol_table *symtab)
+{
+ generate_120_types(symtab);
+
+ add_types_to_symbol_table(symtab, builtin_130_types,
+ Elements(builtin_130_types));
+}
+
+
+void
+_mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state)
+{
+ switch (state->language_version) {
+ case 110:
+ generate_110_types(state->symbols);
+ break;
+ case 120:
+ generate_120_types(state->symbols);
+ break;
+ case 130:
+ generate_130_types(state->symbols);
+ break;
+ default:
+ /* error */
+ break;
+ }
+}
+
+
+const struct glsl_type *
+_mesa_glsl_get_vector_type(unsigned base_type, unsigned vector_length)
+{
+ switch (base_type) {
+ case GLSL_TYPE_UINT:
+ switch (vector_length) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ return glsl_uint_type + (vector_length - 1);
+ default:
+ return glsl_error_type;
+ }
+ case GLSL_TYPE_INT:
+ switch (vector_length) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ return glsl_int_type + (vector_length - 1);
+ default:
+ return glsl_error_type;
+ }
+ case GLSL_TYPE_FLOAT:
+ switch (vector_length) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ return glsl_float_type + (vector_length - 1);
+ default:
+ return glsl_error_type;
+ }
+ case GLSL_TYPE_BOOL:
+ switch (vector_length) {
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ return glsl_bool_type + (vector_length - 1);
+ default:
+ return glsl_error_type;
+ }
+ default:
+ return glsl_error_type;
+ }
+}
#ifndef GLSL_TYPES_H
#define GLSL_TYPES_H
+#include <cstring>
+
#define GLSL_TYPE_UINT 0
#define GLSL_TYPE_INT 1
#define GLSL_TYPE_FLOAT 2
#define is_error_type(t) ((t)->base_type == GLSL_TYPE_ERROR)
-#define GLSL_SAMPLER_DIM_1D 0
-#define GLSL_SAMPLER_DIM_2D 1
-#define GLSL_SAMPLER_DIM_3D 2
-#define GLSL_SAMPLER_DIM_CUBE 3
-#define GLSL_SAMPLER_DIM_RECT 4
-#define GLSL_SAMPLER_DIM_BUF 5
+enum glsl_sampler_dim {
+ GLSL_SAMPLER_DIM_1D = 0,
+ GLSL_SAMPLER_DIM_2D,
+ GLSL_SAMPLER_DIM_3D,
+ GLSL_SAMPLER_DIM_CUBE,
+ GLSL_SAMPLER_DIM_RECT,
+ GLSL_SAMPLER_DIM_BUF
+};
struct glsl_type {
const struct glsl_type *parameters; /**< Parameters to function. */
const struct glsl_struct_field *structure;/**< List of struct fields. */
} fields;
+
+
+ glsl_type(unsigned base_type, unsigned vector_elements,
+ unsigned matrix_rows, const char *name) :
+ base_type(base_type),
+ sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
+ sampler_type(0),
+ vector_elements(vector_elements), matrix_rows(matrix_rows),
+ name(name),
+ length(0)
+ {
+ memset(& fields, 0, sizeof(fields));
+ }
+
+ glsl_type(enum glsl_sampler_dim dim, bool shadow, bool array,
+ unsigned type, const char *name) :
+ base_type(GLSL_TYPE_SAMPLER),
+ sampler_dimensionality(dim), sampler_shadow(shadow),
+ sampler_array(array), sampler_type(type),
+ vector_elements(0), matrix_rows(0),
+ name(name),
+ length(0)
+ {
+ memset(& fields, 0, sizeof(fields));
+ }
+
+ glsl_type(const glsl_struct_field *fields, unsigned num_fields,
+ const char *name) :
+ base_type(GLSL_TYPE_STRUCT),
+ sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
+ sampler_type(0),
+ vector_elements(0), matrix_rows(0),
+ name(name),
+ length(num_fields)
+ {
+ this->fields.structure = fields;
+ }
};
#define is_glsl_type_scalar(t) \
projects / mesa.git / commitdiff