src/gallium/winsys/virgl/vtest/Makefile
src/gbm/Makefile
src/gbm/main/gbm.pc
- src/glsl/Makefile
src/glx/Makefile
src/glx/apple/Makefile
src/glx/tests/Makefile
SUBDIRS += compiler
if NEED_OPENGL_COMMON
-SUBDIRS += glsl mesa
+SUBDIRS += mesa
endif
SUBDIRS += loader
SConscript('util/SConscript')
SConscript('compiler/SConscript')
-SConscript('glsl/SConscript')
if env['hostonly']:
# We are just compiling the things necessary on the host for cross
#
+# Copyright © 2012 Jon TURNEY
# Copyright (C) 2015 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
+ -I$(top_builddir)/src/compiler/glsl\
+ -I$(top_srcdir)/src/compiler/glsl\
+ -I$(top_srcdir)/src/compiler/glsl/glcpp\
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gtest/include \
EXTRA_DIST = SConscript
+EXTRA_DIST += glsl/tests glsl/glcpp/tests glsl/README \
+ glsl/TODO glsl/glcpp/README \
+ glsl/glsl_lexer.ll \
+ glsl/glsl_parser.yy \
+ glsl/glcpp/glcpp-lex.l \
+ glsl/glcpp/glcpp-parse.y \
+ glsl/Makefile.sources \
+ glsl/SConscript
+
+TESTS += glsl/glcpp/tests/glcpp-test \
+ glsl/glcpp/tests/glcpp-test-cr-lf \
+ glsl/tests/blob-test \
+ glsl/tests/general-ir-test \
+ glsl/tests/optimization-test \
+ glsl/tests/sampler-types-test \
+ glsl/tests/uniform-initializer-test
+
+TESTS_ENVIRONMENT= \
+ export PYTHON2=$(PYTHON2); \
+ export PYTHON_FLAGS=$(PYTHON_FLAGS);
+
+check_PROGRAMS += \
+ glsl/glcpp/glcpp \
+ glsl/glsl_test \
+ glsl/tests/blob-test \
+ glsl/tests/general-ir-test \
+ glsl/tests/sampler-types-test \
+ glsl/tests/uniform-initializer-test
+
+noinst_PROGRAMS = glsl_compiler
+
+glsl_tests_blob_test_SOURCES = \
+ glsl/tests/blob_test.c
+glsl_tests_blob_test_LDADD = \
+ glsl/libglsl.la
+
+glsl_tests_general_ir_test_SOURCES = \
+ glsl/standalone_scaffolding.cpp \
+ glsl/tests/builtin_variable_test.cpp \
+ glsl/tests/invalidate_locations_test.cpp \
+ glsl/tests/general_ir_test.cpp \
+ glsl/tests/varyings_test.cpp
+glsl_tests_general_ir_test_CFLAGS = \
+ $(PTHREAD_CFLAGS)
+glsl_tests_general_ir_test_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ glsl/libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
+ $(PTHREAD_LIBS)
+
+glsl_tests_uniform_initializer_test_SOURCES = \
+ glsl/tests/copy_constant_to_storage_tests.cpp \
+ glsl/tests/set_uniform_initializer_tests.cpp \
+ glsl/tests/uniform_initializer_utils.cpp \
+ glsl/tests/uniform_initializer_utils.h
+glsl_tests_uniform_initializer_test_CFLAGS = \
+ $(PTHREAD_CFLAGS)
+glsl_tests_uniform_initializer_test_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ glsl/libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
+ $(PTHREAD_LIBS)
+
+glsl_tests_sampler_types_test_SOURCES = \
+ glsl/tests/sampler_types_test.cpp
+glsl_tests_sampler_types_test_CFLAGS = \
+ $(PTHREAD_CFLAGS)
+glsl_tests_sampler_types_test_LDADD = \
+ $(top_builddir)/src/gtest/libgtest.la \
+ glsl/libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
+ $(PTHREAD_LIBS)
+
+noinst_LTLIBRARIES += glsl/libglsl.la glsl/libglcpp.la
+
+glsl_libglcpp_la_LIBADD = \
+ $(top_builddir)/src/util/libmesautil.la
+glsl_libglcpp_la_SOURCES = \
+ glsl/glcpp/glcpp-lex.c \
+ glsl/glcpp/glcpp-parse.c \
+ glsl/glcpp/glcpp-parse.h \
+ $(LIBGLCPP_FILES)
+
+glsl_glcpp_glcpp_SOURCES = \
+ glsl/glcpp/glcpp.c
+glsl_glcpp_glcpp_LDADD = \
+ glsl/libglcpp.la \
+ $(top_builddir)/src/libglsl_util.la \
+ -lm
+
+glsl_libglsl_la_LIBADD = \
+ nir/libnir.la \
+ glsl/libglcpp.la
+
+glsl_libglsl_la_SOURCES = \
+ glsl/glsl_lexer.cpp \
+ glsl/glsl_parser.cpp \
+ glsl/glsl_parser.h \
+ $(LIBGLSL_FILES)
+
+
+glsl_compiler_SOURCES = \
+ $(GLSL_COMPILER_CXX_FILES)
+
+glsl_compiler_LDADD = \
+ glsl/libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
+ $(top_builddir)/src/util/libmesautil.la \
+ $(PTHREAD_LIBS)
+
+glsl_glsl_test_SOURCES = \
+ glsl/standalone_scaffolding.cpp \
+ glsl/test.cpp \
+ glsl/test_optpass.cpp \
+ glsl/test_optpass.h
+
+glsl_glsl_test_LDADD = \
+ glsl/libglsl.la \
+ $(top_builddir)/src/libglsl_util.la \
+ $(PTHREAD_LIBS)
+
+# We write our own rules for yacc and lex below. We'd rather use automake,
+# but automake makes it especially difficult for a number of reasons:
+#
+# * < automake-1.12 generates .h files from .yy and .ypp files, but
+# >=automake-1.12 generates .hh and .hpp files respectively. There's no
+# good way of making a project that uses C++ yacc files compatible with
+# both versions of automake. Strong work automake developers.
+#
+# * Since we're generating code from .l/.y files in a subdirectory (glcpp/)
+# we'd like the resulting generated code to also go in glcpp/ for purposes
+# of distribution. Automake gives no way to do this.
+#
+# * Since we're building multiple yacc parsers into one library (and via one
+# Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes
+# automake to name the resulting generated code as <library-name>_filename.c.
+# Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file.
+
+# In order to make build output print "LEX" and "YACC", we reproduce the
+# automake variables below.
+
+AM_V_LEX = $(am__v_LEX_$(V))
+am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY))
+am__v_LEX_0 = @echo " LEX " $@;
+am__v_LEX_1 =
+
+AM_V_YACC = $(am__v_YACC_$(V))
+am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
+am__v_YACC_0 = @echo " YACC " $@;
+am__v_YACC_1 =
+
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+YACC_GEN = $(AM_V_YACC)$(YACC) $(YFLAGS)
+LEX_GEN = $(AM_V_LEX)$(LEX) $(LFLAGS)
+
+glsl/glsl_parser.cpp glsl/glsl_parser.h: glsl/glsl_parser.yy
+ $(YACC_GEN) -o $@ -p "_mesa_glsl_" --defines=$(builddir)/glsl/glsl_parser.h $(srcdir)/glsl/glsl_parser.yy
+
+glsl/glsl_lexer.cpp: glsl/glsl_lexer.ll
+ $(LEX_GEN) -o $@ $(srcdir)/glsl/glsl_lexer.ll
+
+glsl/glcpp/glcpp-parse.c glsl/glcpp/glcpp-parse.h: glsl/glcpp/glcpp-parse.y
+ $(MKDIR_GEN)
+ $(YACC_GEN) -o $@ -p "glcpp_parser_" --defines=$(builddir)/glsl/glcpp/glcpp-parse.h $(srcdir)/glsl/glcpp/glcpp-parse.y
+
+glsl/glcpp/glcpp-lex.c: glsl/glcpp/glcpp-lex.l
+ $(MKDIR_GEN)
+ $(LEX_GEN) -o $@ $(srcdir)/glsl/glcpp/glcpp-lex.l
+
+# Only the parsers (specifically the header files generated at the same time)
+# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is
+# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files
+# YACC is only executed once for each parser. The rest of the generated code
+# will be created at the appropriate times according to standard automake
+# dependency rules.
+BUILT_SOURCES += \
+ glsl/glsl_parser.cpp \
+ glsl/glsl_lexer.cpp \
+ glsl/glcpp/glcpp-parse.c \
+ glsl/glcpp/glcpp-lex.c
+CLEANFILES += \
+ glsl/glcpp/glcpp-parse.h \
+ glsl/glsl_parser.h \
+ glsl/glsl_parser.cpp \
+ glsl/glsl_lexer.cpp \
+ glsl/glcpp/glcpp-parse.c \
+ glsl/glcpp/glcpp-lex.c
+
+clean-local:
+ $(RM) -r subtest-cr subtest-cr-lf subtest-lf subtest-lf-cr
+
+dist-hook:
+ $(RM) glsl/glcpp/tests/*.out
+ $(RM) glsl/glcpp/tests/subtest*/*.out
+
noinst_LTLIBRARIES += nir/libnir.la
nir_libnir_la_CPPFLAGS = \
$(PTHREAD_CFLAGS)
nir_tests_control_flow_tests_LDADD = \
$(top_builddir)/src/gtest/libgtest.la \
- $(top_builddir)/src/compiler/nir/libnir.la \
+ nir/libnir.la \
$(top_builddir)/src/util/libmesautil.la \
$(PTHREAD_LIBS)
shader_enums.c \
shader_enums.h
+# libglsl
+
+LIBGLSL_FILES = \
+ glsl/ast.h \
+ glsl/ast_array_index.cpp \
+ glsl/ast_expr.cpp \
+ glsl/ast_function.cpp \
+ glsl/ast_to_hir.cpp \
+ glsl/ast_type.cpp \
+ glsl/blob.c \
+ glsl/blob.h \
+ glsl/builtin_functions.cpp \
+ glsl/builtin_types.cpp \
+ glsl/builtin_variables.cpp \
+ glsl/glsl_parser_extras.cpp \
+ glsl/glsl_parser_extras.h \
+ glsl/glsl_symbol_table.cpp \
+ glsl/glsl_symbol_table.h \
+ glsl/hir_field_selection.cpp \
+ glsl/ir_basic_block.cpp \
+ glsl/ir_basic_block.h \
+ glsl/ir_builder.cpp \
+ glsl/ir_builder.h \
+ glsl/ir_clone.cpp \
+ glsl/ir_constant_expression.cpp \
+ glsl/ir.cpp \
+ glsl/ir.h \
+ glsl/ir_equals.cpp \
+ glsl/ir_expression_flattening.cpp \
+ glsl/ir_expression_flattening.h \
+ glsl/ir_function_can_inline.cpp \
+ glsl/ir_function_detect_recursion.cpp \
+ glsl/ir_function_inlining.h \
+ glsl/ir_function.cpp \
+ glsl/ir_hierarchical_visitor.cpp \
+ glsl/ir_hierarchical_visitor.h \
+ glsl/ir_hv_accept.cpp \
+ glsl/ir_import_prototypes.cpp \
+ glsl/ir_optimization.h \
+ glsl/ir_print_visitor.cpp \
+ glsl/ir_print_visitor.h \
+ glsl/ir_reader.cpp \
+ glsl/ir_reader.h \
+ glsl/ir_rvalue_visitor.cpp \
+ glsl/ir_rvalue_visitor.h \
+ glsl/ir_set_program_inouts.cpp \
+ glsl/ir_uniform.h \
+ glsl/ir_validate.cpp \
+ glsl/ir_variable_refcount.cpp \
+ glsl/ir_variable_refcount.h \
+ glsl/ir_visitor.h \
+ glsl/linker.cpp \
+ glsl/linker.h \
+ glsl/link_atomics.cpp \
+ glsl/link_functions.cpp \
+ glsl/link_interface_blocks.cpp \
+ glsl/link_uniforms.cpp \
+ glsl/link_uniform_initializers.cpp \
+ glsl/link_uniform_block_active_visitor.cpp \
+ glsl/link_uniform_block_active_visitor.h \
+ glsl/link_uniform_blocks.cpp \
+ glsl/link_varyings.cpp \
+ glsl/link_varyings.h \
+ glsl/list.h \
+ glsl/loop_analysis.cpp \
+ glsl/loop_analysis.h \
+ glsl/loop_controls.cpp \
+ glsl/loop_unroll.cpp \
+ glsl/lower_buffer_access.cpp \
+ glsl/lower_buffer_access.h \
+ glsl/lower_clip_distance.cpp \
+ glsl/lower_const_arrays_to_uniforms.cpp \
+ glsl/lower_discard.cpp \
+ glsl/lower_discard_flow.cpp \
+ glsl/lower_if_to_cond_assign.cpp \
+ glsl/lower_instructions.cpp \
+ glsl/lower_jumps.cpp \
+ glsl/lower_mat_op_to_vec.cpp \
+ glsl/lower_noise.cpp \
+ glsl/lower_offset_array.cpp \
+ glsl/lower_packed_varyings.cpp \
+ glsl/lower_named_interface_blocks.cpp \
+ glsl/lower_packing_builtins.cpp \
+ glsl/lower_subroutine.cpp \
+ glsl/lower_tess_level.cpp \
+ glsl/lower_texture_projection.cpp \
+ glsl/lower_variable_index_to_cond_assign.cpp \
+ glsl/lower_vec_index_to_cond_assign.cpp \
+ glsl/lower_vec_index_to_swizzle.cpp \
+ glsl/lower_vector.cpp \
+ glsl/lower_vector_derefs.cpp \
+ glsl/lower_vector_insert.cpp \
+ glsl/lower_vertex_id.cpp \
+ glsl/lower_output_reads.cpp \
+ glsl/lower_shared_reference.cpp \
+ glsl/lower_ubo_reference.cpp \
+ glsl/opt_algebraic.cpp \
+ glsl/opt_array_splitting.cpp \
+ glsl/opt_conditional_discard.cpp \
+ glsl/opt_constant_folding.cpp \
+ glsl/opt_constant_propagation.cpp \
+ glsl/opt_constant_variable.cpp \
+ glsl/opt_copy_propagation.cpp \
+ glsl/opt_copy_propagation_elements.cpp \
+ glsl/opt_dead_builtin_variables.cpp \
+ glsl/opt_dead_builtin_varyings.cpp \
+ glsl/opt_dead_code.cpp \
+ glsl/opt_dead_code_local.cpp \
+ glsl/opt_dead_functions.cpp \
+ glsl/opt_flatten_nested_if_blocks.cpp \
+ glsl/opt_flip_matrices.cpp \
+ glsl/opt_function_inlining.cpp \
+ glsl/opt_if_simplification.cpp \
+ glsl/opt_minmax.cpp \
+ glsl/opt_noop_swizzle.cpp \
+ glsl/opt_rebalance_tree.cpp \
+ glsl/opt_redundant_jumps.cpp \
+ glsl/opt_structure_splitting.cpp \
+ glsl/opt_swizzle_swizzle.cpp \
+ glsl/opt_tree_grafting.cpp \
+ glsl/opt_vectorize.cpp \
+ glsl/program.h \
+ glsl/s_expression.cpp \
+ glsl/s_expression.h
+
+# glsl_compiler
+
+GLSL_COMPILER_CXX_FILES = \
+ glsl/standalone_scaffolding.cpp \
+ glsl/standalone_scaffolding.h \
+ glsl/main.cpp
+
+# libglsl generated sources
+LIBGLSL_GENERATED_CXX_FILES = \
+ glsl/glsl_lexer.cpp \
+ glsl/glsl_parser.cpp
+
+# libglcpp
+
+LIBGLCPP_FILES = \
+ glsl/glcpp/glcpp.h \
+ glsl/glcpp/pp.c
+
+LIBGLCPP_GENERATED_FILES = \
+ glsl/glcpp/glcpp-lex.c \
+ glsl/glcpp/glcpp-parse.c
+
NIR_GENERATED_FILES = \
nir/nir_builder_opcodes.h \
nir/nir_constant_expressions.c \
source = sources
)
Export('compiler')
+
+SConscript('glsl/SConscript')
#!/bin/sh
if [ ! -z "$srcdir" ]; then
- testdir=$srcdir/glcpp/tests
- outdir=`pwd`/glcpp/tests
- glcpp=`pwd`/glcpp/glcpp
+ testdir=$srcdir/glsl/glcpp/tests
+ outdir=`pwd`/glsl/glcpp/tests
+ glcpp=`pwd`/glsl/glcpp/glcpp
else
testdir=.
outdir=.
# glcpp-test script.
if [ ! -z "$srcdir" ]; then
- testdir="$srcdir/glcpp/tests"
- glcpp_test="$srcdir/glcpp/tests/glcpp-test"
+ testdir="$srcdir/glsl/glcpp/tests"
+ glcpp_test="$srcdir/glsl/glcpp/tests/glcpp-test"
else
testdir=.
glcpp_test=./glcpp-test
for file in "$testdir"/*.c; do
base=$(basename "$file")
tr "\n" "\r" < "$file" > subtest-cr/"$base"
- cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected
+ cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr/"$base".expected
done
run_test "${glcpp_test} --testdir=subtest-cr"
for file in "$testdir"/*.c; do
base=$(basename "$file")
sed -e 's/$/\r/' < "$file" > subtest-cr-lf/"$base"
- cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected
+ cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-cr-lf/"$base".expected
done
run_test "${glcpp_test} --testdir=subtest-cr-lf"
for file in "$testdir"/*.c; do
base=$(basename "$file")
sed -e 's/$/\r/' < "$file" | tr "\n\r" "\r\n" > subtest-lf-cr/"$base"
- cp `pwd`/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected
+ cp `pwd`/glsl/glcpp/tests/subtest-lf/"$base".out subtest-lf-cr/"$base".expected
done
run_test "${glcpp_test} --testdir=subtest-lf-cr"
#include <stdio.h>
#include "main/macros.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
#include "glsl_types.h"
#include "util/hash_table.h"
--- /dev/null
+NIR_GENERATED_FILES = \
+ nir_builder_opcodes.h \
+ nir_constant_expressions.c \
+ nir_opcodes.c \
+ nir_opcodes.h \
+ nir_opt_algebraic.c
+
+NIR_FILES = \
+ glsl_to_nir.cpp \
+ glsl_to_nir.h \
+ nir.c \
+ nir.h \
+ nir_array.h \
+ nir_builder.h \
+ nir_clone.c \
+ nir_constant_expressions.h \
+ nir_control_flow.c \
+ nir_control_flow.h \
+ nir_control_flow_private.h \
+ nir_dominance.c \
+ nir_from_ssa.c \
+ nir_gs_count_vertices.c \
+ nir_intrinsics.c \
+ nir_intrinsics.h \
+ nir_instr_set.c \
+ nir_instr_set.h \
+ nir_liveness.c \
+ nir_lower_alu_to_scalar.c \
+ nir_lower_atomics.c \
+ nir_lower_clip.c \
+ nir_lower_global_vars_to_local.c \
+ nir_lower_gs_intrinsics.c \
+ nir_lower_load_const_to_scalar.c \
+ nir_lower_locals_to_regs.c \
+ nir_lower_idiv.c \
+ nir_lower_io.c \
+ nir_lower_outputs_to_temporaries.c \
+ nir_lower_phis_to_scalar.c \
+ nir_lower_samplers.c \
+ nir_lower_system_values.c \
+ nir_lower_tex.c \
+ nir_lower_to_source_mods.c \
+ nir_lower_two_sided_color.c \
+ nir_lower_vars_to_ssa.c \
+ nir_lower_var_copies.c \
+ nir_lower_vec_to_movs.c \
+ nir_metadata.c \
+ nir_move_vec_src_uses_to_dest.c \
+ nir_normalize_cubemap_coords.c \
+ nir_opt_constant_folding.c \
+ nir_opt_copy_propagate.c \
+ nir_opt_cse.c \
+ nir_opt_dce.c \
+ nir_opt_dead_cf.c \
+ nir_opt_gcm.c \
+ nir_opt_global_to_local.c \
+ nir_opt_peephole_select.c \
+ nir_opt_remove_phis.c \
+ nir_opt_undef.c \
+ nir_print.c \
+ nir_remove_dead_variables.c \
+ nir_search.c \
+ nir_search.h \
+ nir_split_var_copies.c \
+ nir_sweep.c \
+ nir_to_ssa.c \
+ nir_validate.c \
+ nir_vla.h \
+ nir_worklist.c \
+ nir_worklist.h
+
#include "glsl_to_nir.h"
#include "nir_control_flow.h"
#include "nir_builder.h"
-#include "glsl/ir_visitor.h"
-#include "glsl/ir_hierarchical_visitor.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir_visitor.h"
+#include "compiler/glsl/ir_hierarchical_visitor.h"
+#include "compiler/glsl/ir.h"
#include "main/imports.h"
/*
*/
#include "nir.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
#ifdef __cplusplus
extern "C" {
#pragma once
#include "util/hash_table.h"
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
#include "GL/gl.h" /* GLenum */
#include "util/list.h"
#include "util/ralloc.h"
*
*/
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
#include "nir.h"
#include "main/config.h"
#include <assert.h>
#include "nir.h"
#include "nir_builder.h"
#include "program/hash_table.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
#include "main/compiler.h"
#include "main/mtypes.h"
*/
#include "nir_types.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
void
glsl_print_type(const glsl_type *type, FILE *fp)
#include "compiler/nir/nir.h"
#include "compiler/nir/nir_control_flow.h"
#include "compiler/nir/nir_builder.h"
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
#include "compiler/shader_enums.h"
#include "tgsi_to_nir.h"
$(MESA_ASM_FILES_FOR_ARCH)
libmesa_la_LIBADD = \
- $(top_builddir)/src/glsl/libglsl.la \
+ $(top_builddir)/src/compiler/glsl/libglsl.la \
$(ARCH_LIBS)
libmesagallium_la_SOURCES = \
$(MESA_ASM_FILES_FOR_ARCH)
libmesagallium_la_LIBADD = \
- $(top_builddir)/src/glsl/libglsl.la \
+ $(top_builddir)/src/compiler/glsl/libglsl.la \
$(ARCH_LIBS)
libmesa_sse41_la_SOURCES = \
INCLUDE_DIRS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/src/glsl \
-I$(top_builddir)/src/compiler/nir \
- -I$(top_builddir)/src/glsl \
- -I$(top_srcdir)/src/glsl/glcpp \
-I$(top_srcdir)/src/mesa \
-I$(top_builddir)/src/mesa \
-I$(top_srcdir)/src/mesa/main \
#include "intel_batchbuffer.h"
#include "brw_nir.h"
#include "brw_program.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
static void
assign_cs_binding_table_offsets(const struct brw_device_info *devinfo,
*/
#include "compiler/glsl_types.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
#include "program/prog_instruction.h" /* For WRITEMASK_* */
class brw_cubemap_normalize_visitor : public ir_hierarchical_visitor {
#include "brw_shader.h"
#include "brw_ir_fs.h"
#include "brw_fs_builder.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
#include "compiler/nir/nir.h"
struct bblock_t;
* we do retain the vector types in that case.
*/
-#include "glsl/ir.h"
-#include "glsl/ir_expression_flattening.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_expression_flattening.h"
#include "compiler/glsl_types.h"
class ir_channel_expressions_visitor : public ir_hierarchical_visitor {
* IN THE SOFTWARE.
*/
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
#include "main/shaderimage.h"
#include "brw_fs.h"
#include "brw_fs_surface_builder.h"
*/
#include "main/imports.h"
-#include "glsl/ir.h"
-#include "glsl/ir_rvalue_visitor.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_rvalue_visitor.h"
#include "compiler/glsl_types.h"
#include "util/hash_table.h"
#include "brw_ff_gs.h"
#include "brw_nir.h"
#include "brw_program.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
static void
brw_gs_debug_recompile(struct brw_context *brw,
#include "brw_fs.h"
#include "brw_nir.h"
#include "brw_program.h"
-#include "glsl/ir_optimization.h"
+#include "compiler/glsl/ir_optimization.h"
#include "program/program.h"
#include "main/shaderapi.h"
#include "main/uniforms.h"
* \file brw_lower_texture_gradients.cpp
*/
-#include "glsl/ir.h"
-#include "glsl/ir_builder.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_builder.h"
#include "program/prog_instruction.h"
#include "brw_context.h"
*/
#include "compiler/glsl_types.h"
-#include "glsl/ir.h"
-#include "glsl/ir_builder.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_builder.h"
using namespace ir_builder;
#include "brw_shader.h"
#include "brw_nir.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
static void
brw_nir_setup_glsl_builtin_uniform(nir_variable *var,
#include "program/programopt.h"
#include "tnl/tnl.h"
#include "util/ralloc.h"
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
#include "brw_program.h"
#include "brw_context.h"
#include "brw_ir_vec4.h"
#endif
-#include "glsl/ir.h"
+#include "compiler/glsl/ir.h"
#include "compiler/nir/nir.h"
#include "intel_batchbuffer.h"
#include "brw_state.h"
#include "program/prog_statevars.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
static unsigned
get_cs_thread_count(const struct brw_cs_prog_data *cs_prog_data)
#pragma once
#include <stdint.h>
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
#ifdef __cplusplus
extern "C" {
#include "sparc/sparc.h"
#endif
-#include "glsl_parser_extras.h"
+#include "compiler/glsl/glsl_parser_extras.h"
#include <stdbool.h>
#include "main/texenvprogram.h"
#include "main/texobj.h"
#include "main/uniforms.h"
-#include "glsl/ir_builder.h"
-#include "glsl/ir_optimization.h"
-#include "glsl/glsl_parser_extras.h"
-#include "glsl/glsl_symbol_table.h"
+#include "compiler/glsl/ir_builder.h"
+#include "compiler/glsl/ir_optimization.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/glsl_symbol_table.h"
#include "compiler/glsl_types.h"
#include "program/ir_to_mesa.h"
#include "program/program.h"
#include "main/shaderobj.h"
#include "main/transformfeedback.h"
#include "main/uniforms.h"
-#include "glsl/glsl_parser_extras.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ir_uniform.h"
#include "program/program.h"
#include "program/prog_parameter.h"
#include "util/ralloc.h"
#include "main/shaderobj.h"
#include "main/context.h"
#include "program_resource.h"
-#include "ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
static bool
supported_interface_enum(struct gl_context *ctx, GLenum iface)
{
#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
-#include "glsl/glsl_symbol_table.h"
-#include "glsl/ir.h"
-#include "glsl/program.h"
+#include "compiler/glsl/glsl_symbol_table.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/program.h"
#include "program/hash_table.h"
#include "util/strndup.h"
#include "main/shaderobj.h"
#include "main/transformfeedback.h"
#include "main/uniforms.h"
-#include "glsl/glsl_parser_extras.h"
-#include "glsl/ir.h"
-#include "glsl/ir_uniform.h"
-#include "glsl/program.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_uniform.h"
+#include "compiler/glsl/program.h"
#include "program/program.h"
#include "program/prog_print.h"
#include "program/prog_parameter.h"
#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
-#include "glsl/ir.h"
-#include "glsl/ir_uniform.h"
-#include "glsl/glsl_parser_extras.h"
-#include "glsl/program.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_uniform.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/program.h"
#include "program/hash_table.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
#include "main/enums.h"
-#include "ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
#include "compiler/glsl_types.h"
#include "program/program.h"
#include "main/glheader.h"
#include "compiler/glsl_types.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
#include "program/prog_parameter.h"
#ifdef __cplusplus
#include "main/shaderapi.h"
#include "main/shaderobj.h"
#include "main/uniforms.h"
-#include "glsl/ast.h"
-#include "glsl/ir.h"
-#include "glsl/ir_expression_flattening.h"
-#include "glsl/ir_visitor.h"
-#include "glsl/ir_optimization.h"
-#include "glsl/ir_uniform.h"
-#include "glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ast.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_expression_flattening.h"
+#include "compiler/glsl/ir_visitor.h"
+#include "compiler/glsl/ir_optimization.h"
+#include "compiler/glsl/ir_uniform.h"
+#include "compiler/glsl/glsl_parser_extras.h"
#include "compiler/glsl_types.h"
-#include "glsl/linker.h"
-#include "glsl/program.h"
+#include "compiler/glsl/linker.h"
+#include "compiler/glsl/program.h"
#include "program/hash_table.h"
#include "program/prog_instruction.h"
#include "program/prog_optimize.h"
#include "compiler/nir/nir.h"
#include "compiler/nir/nir_builder.h"
-#include "glsl/list.h"
+#include "compiler/glsl/list.h"
#include "main/imports.h"
#include "util/ralloc.h"
#include "main/mtypes.h"
#include "compiler/glsl_types.h"
-#include "glsl/ir.h"
-#include "glsl/ir_uniform.h"
-#include "glsl/ir_visitor.h"
-#include "glsl/program.h"
+#include "compiler/glsl/ir.h"
+#include "compiler/glsl/ir_uniform.h"
+#include "compiler/glsl/ir_visitor.h"
+#include "compiler/glsl/program.h"
#include "program/hash_table.h"
#include "program/prog_parameter.h"
#include "program/program.h"
#include "main/macros.h"
#include "main/varray.h"
-#include "glsl/ir_uniform.h"
+#include "compiler/glsl/ir_uniform.h"
#include "vbo/vbo.h"
#include "st_glsl_to_tgsi.h"
-#include "glsl_parser_extras.h"
-#include "ir_optimization.h"
+#include "compiler/glsl/glsl_parser_extras.h"
+#include "compiler/glsl/ir_optimization.h"
#include "main/errors.h"
#include "main/shaderobj.h"
projects / platform / upstream / mesa.git / commitdiff