LIBCOMPILER_FILES = \
builtin_type_macros.h \
+ glsl_types.cpp \
+ glsl_types.h \
shader_enums.c \
shader_enums.h
#include <stdio.h>
#include "main/macros.h"
-#include "glsl_parser_extras.h"
+#include "glsl/glsl_parser_extras.h"
#include "glsl_types.h"
#include "util/hash_table.h"
nir/nir_opt_algebraic.c
NIR_FILES = \
- nir/glsl_types.cpp \
- nir/glsl_types.h \
nir/nir.c \
nir/nir.h \
nir/nir_array.h \
'#src/gallium/include',
'#src/gallium/auxiliary',
'#src/glsl',
- '#src/glsl/nir',
'#src/glsl/glcpp',
])
for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'):
glsl_sources += source_lists[l]
-# add nir/glsl_types.cpp manually, because SCons still doesn't know about NIR.
-# XXX: Remove this once we build NIR and NIR_FILES.
-glsl_sources += [
- 'nir/glsl_types.cpp',
-]
-
if env['msvc']:
env.Prepend(CPPPATH = ['#/src/getopt'])
env.PrependUnique(LIBS = [getopt])
*/
#include "ast.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
void
#include "glsl_symbol_table.h"
#include "ast.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
#include "main/core.h" /* for MIN2 */
#include "main/shaderobj.h"
#include "glsl_symbol_table.h"
#include "glsl_parser_extras.h"
#include "ast.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "program/hash_table.h"
#include "main/shaderobj.h"
#include "ir.h"
* version and set of enabled extensions.
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "glsl_parser_extras.h"
#include "util/macros.h"
#include "ast.h"
#include "glsl_parser_extras.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "main/context.h"
#ifdef _MSC_VER
#include "ir.h"
#include "glsl_parser_extras.h"
#include "ast.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
ir_rvalue *
_mesa_ast_field_selection_to_hir(const ast_expression *expr,
#include <string.h>
#include "main/core.h" /* for MAX2 */
#include "ir.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
ir_rvalue::ir_rvalue(enum ir_node_type t)
: ir_instruction(t)
#include <stdlib.h>
#include "util/ralloc.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "list.h"
#include "ir_visitor.h"
#include "ir_hierarchical_visitor.h"
#include <string.h>
#include "main/compiler.h"
#include "ir.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "program/hash_table.h"
ir_rvalue *
#include "util/rounding.h" /* for _mesa_roundeven */
#include "util/half_float.h"
#include "ir.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "program/hash_table.h"
static float
* DEALINGS IN THE SOFTWARE.
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
#include "glsl_parser_extras.h"
#include "main/errors.h"
*/
#include "ir_print_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "glsl_parser_extras.h"
#include "main/macros.h"
#include "util/hash_table.h"
#include "ir_reader.h"
#include "glsl_parser_extras.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "s_expression.h"
static const bool debug = false;
#include "ir.h"
#include "ir_visitor.h"
#include "ir_rvalue_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
ir_visitor_status
ir_rvalue_base_visitor::rvalue_visit(ir_expression *ir)
#include "main/core.h" /* for struct gl_program */
#include "ir.h"
#include "ir_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir_hierarchical_visitor.h"
#include "util/hash_table.h"
#include "util/set.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir.h"
#include "ir_visitor.h"
#include "ir_variable_refcount.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "util/hash_table.h"
ir_variable_refcount_visitor::ir_variable_refcount_visitor()
#include "ir.h"
#include "ir_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
struct assignment_entry {
exec_node link;
* DEALINGS IN THE SOFTWARE.
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "loop_analysis.h"
#include "ir_hierarchical_visitor.h"
#include <limits.h>
#include "main/compiler.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "loop_analysis.h"
#include "ir_hierarchical_visitor.h"
* DEALINGS IN THE SOFTWARE.
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "loop_analysis.h"
#include "ir_hierarchical_visitor.h"
#include "ir.h"
#include "ir_visitor.h"
#include "ir_rvalue_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
class lower_const_array_visitor : public ir_rvalue_visitor {
* Unconditional discards are treated as having a condition of "true".
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
namespace {
* interpretation.
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
#include "program/hash_table.h"
* to attempt to flatten any if-statements appearing at depth > N.
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
#include "program/hash_table.h"
#include "c99_math.h"
#include "program/prog_instruction.h" /* for swizzle */
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
#include "ir_builder.h"
#include "ir_optimization.h"
* prevents further optimization, and thus is not currently performed.
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include <string.h>
#include "ir.h"
#include "ir.h"
#include "ir_expression_flattening.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
* \author Chris Forbes <chrisf@ijw.co.nz>
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
#include "ir_builder.h"
#include "ir_optimization.h"
* lowers subroutines to an if ladder.
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "glsl_parser_extras.h"
#include "ir.h"
#include "ir_builder.h"
#include "ir.h"
#include "ir_rvalue_visitor.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "main/macros.h"
/**
#include "ir.h"
#include "ir_visitor.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir.h"
#include "ir_visitor.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "main/macros.h"
/**
#include <stdio.h>
-/* C wrapper around glsl_types.h */
+/* C wrapper around compiler/glsl_types.h */
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#ifdef __cplusplus
extern "C" {
#include "ir_rvalue_visitor.h"
#include "ir_optimization.h"
#include "ir_builder.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
using namespace ir_builder;
#include "ir.h"
#include "ir_visitor.h"
#include "ir_rvalue_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
static bool debug = false;
* (discard <condition>)
*/
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "ir.h"
namespace {
#include "ir_visitor.h"
#include "ir_rvalue_visitor.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir_rvalue_visitor.h"
#include "ir_basic_block.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "util/hash_table.h"
namespace {
#include "ir.h"
#include "ir_visitor.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "util/hash_table.h"
namespace {
#include "ir_visitor.h"
#include "ir_basic_block.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir_rvalue_visitor.h"
#include "ir_basic_block.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
static bool debug = false;
#include "ir_rvalue_visitor.h"
#include "ir_optimization.h"
#include "ir_print_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "link_varyings.h"
namespace {
#include "ir.h"
#include "ir_visitor.h"
#include "ir_variable_refcount.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "util/hash_table.h"
static bool debug = false;
#include "ir.h"
#include "ir_basic_block.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
static bool debug = false;
#include "ir.h"
#include "ir_visitor.h"
#include "ir_expression_flattening.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir_visitor.h"
#include "ir_function_inlining.h"
#include "ir_expression_flattening.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "program/hash_table.h"
static void
#include "ir_optimization.h"
#include "ir_builder.h"
#include "program/prog_instruction.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "main/macros.h"
using namespace ir_builder;
#include "ir.h"
#include "ir_visitor.h"
#include "ir_rvalue_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir.h"
#include "ir_visitor.h"
#include "ir_rvalue_visitor.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir.h"
#include "ir_visitor.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir_variable_refcount.h"
#include "ir_basic_block.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
namespace {
#include "ir.h"
#include "ir_visitor.h"
#include "ir_optimization.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "program/prog_instruction.h"
namespace {
'#/src',
'#/src/mapi',
'#/src/glsl',
- '#/src/glsl/nir',
'#/src/mesa',
'#/src/gallium/include',
'#/src/gallium/auxiliary',
* \author Eric Anholt <eric@anholt.net>
*/
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
#include "glsl/ir.h"
#include "program/prog_instruction.h" /* For WRITEMASK_* */
#include "brw_cfg.h"
#include "brw_program.h"
#include "brw_dead_control_flow.h"
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
using namespace brw;
#include "glsl/ir.h"
#include "glsl/ir_expression_flattening.h"
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
class ir_channel_expressions_visitor : public ir_hierarchical_visitor {
public:
#include "main/imports.h"
#include "glsl/ir.h"
#include "glsl/ir_rvalue_visitor.h"
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
#include "util/hash_table.h"
static bool debug = false;
* in the GLSL IR or in the native code.
*/
#include "brw_fs.h"
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
using namespace brw;
* \author Chris Forbes <chrisf@ijw.co.nz>
*/
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
#include "glsl/ir.h"
#include "glsl/ir_builder.h"
#include "glsl/ir_optimization.h"
#include "glsl/glsl_parser_extras.h"
#include "glsl/glsl_symbol_table.h"
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
#include "program/ir_to_mesa.h"
#include "program/program.h"
#include "program/programopt.h"
#include "main/uniforms.h"
#include "main/enums.h"
#include "ir_uniform.h"
-#include "glsl_types.h"
+#include "compiler/glsl_types.h"
#include "program/program.h"
/**
#define UNIFORMS_H
#include "main/glheader.h"
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
#include "glsl/ir_uniform.h"
#include "program/prog_parameter.h"
#include "glsl/ir_optimization.h"
#include "glsl/ir_uniform.h"
#include "glsl/glsl_parser_extras.h"
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
#include "glsl/linker.h"
#include "glsl/program.h"
#include "program/hash_table.h"
*/
#include "main/mtypes.h"
-#include "glsl/nir/glsl_types.h"
+#include "compiler/glsl_types.h"
#include "glsl/ir.h"
#include "glsl/ir_uniform.h"
#include "glsl/ir_visitor.h"