fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-28 16:28:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
mesa/src/glsl/Makefile

186 lines
4 KiB
Makefile
Raw Normal View History

glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
#src/glsl/pp/Makefile
Build mesa glsl with make. Still don't know how to add glsl to mesa dependencies.
2009-12-10 01:03:15 +01:00
TOP = ../..
include $(TOP)/configs/current
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
LIBNAME = glsl
Build mesa glsl with make. Still don't know how to add glsl to mesa dependencies.
2009-12-10 01:03:15 +01:00
Build a standalone glcpp binary. This is convenient for testing the preprocessor independent of the rest of mesa, (just run glcpp-test in the src/glsl/glcpp/tests).
2010-07-14 14:48:15 -07:00
LIBGLCPP_SOURCES = \
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
glcpp/glcpp-lex.c \
glcpp/glcpp-parse.c \
glcpp: Remove xtalloc wrappers in favor of plain talloc. Calling exit() on a memory failure probably made sense for the standalone preprocessor, but doesn't seem too appealing as part of the GL library. Also, we don't use it in the main compiler.
2010-08-03 20:21:52 -07:00
glcpp/pp.c
Build mesa glsl with make. Still don't know how to add glsl to mesa dependencies.
2009-12-10 01:03:15 +01:00
Build a standalone glcpp binary. This is convenient for testing the preprocessor independent of the rest of mesa, (just run glcpp-test in the src/glsl/glcpp/tests).
2010-07-14 14:48:15 -07:00
GLCPP_SOURCES = \
$(LIBGLCPP_SOURCES) \
glcpp/glcpp.c
C_SOURCES = \
$(LIBGLCPP_SOURCES)
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
CXX_SOURCES = \
ast_expr.cpp \
ast_function.cpp \
ast_to_hir.cpp \
ast_type.cpp \
builtin_function.cpp \
glsl_lexer.cpp \
glsl_parser.cpp \
glsl_parser_extras.cpp \
glsl_types.cpp \
glsl: Use a single shared namespace in the symbol table. As of 1.20, variable names, function names, and structure type names all share a single namespace, and should conflict with one another in the same scope, or hide each other in nested scopes. However, in 1.10, variables and functions can share the same name in the same scope. Structure types, however, conflict with/hide both. Fixes piglit tests redeclaration-06.vert, redeclaration-11.vert, redeclaration-19.vert, and struct-05.vert.
2010-08-21 20:23:18 -07:00
glsl_symbol_table.cpp \
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
hir_field_selection.cpp \
ir_basic_block.cpp \
ir_clone.cpp \
ir_constant_expression.cpp \
ir.cpp \
ir_expression_flattening.cpp \
ir_function_can_inline.cpp \
ir_function.cpp \
ir_hierarchical_visitor.cpp \
ir_hv_accept.cpp \
glsl2: Add function to import function prototypes from one IR tree to another
2010-07-20 11:28:31 -07:00
ir_import_prototypes.cpp \
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
ir_print_visitor.cpp \
ir_reader.cpp \
glsl2: Add a generic visitor class to call back with pointers to each rvalue. I keep copy and pasting this code all over, so consolidate it in one place.
2010-08-13 20:39:24 -07:00
ir_rvalue_visitor.cpp \
glsl2: Move gl_program->InputsRead/OutputsWritten setting to an ir pass. This lets us handle arrays much better than trying to work backwards from assembly. Fixes fbo-drawbuffers-maxtargets on swrast (i965 needs loop unrolling)
2010-08-06 13:07:25 -07:00
ir_set_program_inouts.cpp \
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
ir_validate.cpp \
ir_variable.cpp \
glsl2: Factor out the variable refcounting part of ir_dead_code.cpp.
2010-07-30 16:05:27 -07:00
ir_variable_refcount.cpp \
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
linker.cpp \
linker: First bits of intrastage, intershader function linking This handles the easy case of linking a function in a different compilation unit that doesn't call any functions or reference any global variables.
2010-07-13 17:36:13 -07:00
link_functions.cpp \
glsl2: Add module to analyze variables used in loops This is the first step eventually leading to loop unrolling.
2010-08-26 15:58:33 -07:00
loop_analysis.cpp \
glsl2: Add module to suss out loop control variables from loop analysis data This is the next step on the road to loop unrolling
2010-08-26 16:43:57 -07:00
loop_controls.cpp \
glsl2: Add module to perform simple loop unrolling
2010-08-27 13:59:49 -07:00
loop_unroll.cpp \
glsl: Add a lowering pass to move discards out of if-statements. This should allow lower_if_to_cond_assign to work in the presence of discards, fixing bug #31690 and likely #31983. NOTE: This is a candidate for the 7.9 branch.
2010-11-25 01:09:26 -08:00
lower_discard.cpp \
glsl: Rename various ir_* files to lower_* and opt_*. This helps distinguish between lowering passes, optimization passes, and other compiler code.
2010-11-15 14:35:46 -08:00
lower_if_to_cond_assign.cpp \
glsl: Combine many instruction lowering passes into one. This should save on the overhead of tree-walking and provide a convenient place to add more instruction lowering in the future. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-11-18 17:54:07 -08:00
lower_instructions.cpp \
glsl: Rename various ir_* files to lower_* and opt_*. This helps distinguish between lowering passes, optimization passes, and other compiler code.
2010-11-15 14:35:46 -08:00
lower_jumps.cpp \
lower_mat_op_to_vec.cpp \
glsl2: Add lowering pass to remove noise opcodes
2010-09-09 15:20:09 -07:00
lower_noise.cpp \
glsl: Add a lowering pass for texture projection.
2010-09-30 20:07:27 -07:00
lower_texture_projection.cpp \
glsl: add pass to lower variable array indexing to conditional assignments Currenly GLSL happily generates indirect addressing of any kind of arrays. Unfortunately DirectX 9 GPUs are not guaranteed to support any of them in general. This pass fixes that by lowering such constructs to a binary search on the values, followed at the end by vectorized generation of equality masks, and 4 conditional assignments for each mask generation. Note that this requires the ir_binop_equal change so that we can emit SEQ to generate the boolean masks. Unfortunately, ir_structure_splitting is too dumb to turn the resulting constant array references to individual variables, so this will need to be added too before this pass can actually be effective for temps. Several patches in the glsl2-lower-variable-indexing were squashed into this commit. These patches fix bugs in Luca's original implementation, and the individual patches can be seen in that branch. This was done to aid bisecting in the future. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-09-08 01:35:44 +02:00
lower_variable_index_to_cond_assign.cpp \
glsl: Rename various ir_* files to lower_* and opt_*. This helps distinguish between lowering passes, optimization passes, and other compiler code.
2010-11-15 14:35:46 -08:00
lower_vec_index_to_cond_assign.cpp \
lower_vec_index_to_swizzle.cpp \
glsl: Add ir_quadop_vector expression The vector operator collects 2, 3, or 4 scalar components into a vector. Doing this has several advantages. First, it will make ud-chain tracking for components of vectors much easier. Second, a later optimization pass could collect scalars into vectors to allow generation of SWZ instructions (or similar as operands to other instructions on R200 and i915). It also enables an easy way to generate IR for SWZ instructions in the ARB_vertex_program assembler.
2010-11-16 12:01:42 -08:00
lower_vector.cpp \
glsl: Rename various ir_* files to lower_* and opt_*. This helps distinguish between lowering passes, optimization passes, and other compiler code.
2010-11-15 14:35:46 -08:00
opt_algebraic.cpp \
opt_constant_folding.cpp \
opt_constant_propagation.cpp \
opt_constant_variable.cpp \
opt_copy_propagation.cpp \
opt_dead_code.cpp \
opt_dead_code_local.cpp \
opt_dead_functions.cpp \
glsl: Add an optimization pass to simplify discards. NOTE: This is a candidate for the 7.9 branch.
2010-11-24 22:02:26 -08:00
opt_discard_simplification.cpp \
glsl: Rename various ir_* files to lower_* and opt_*. This helps distinguish between lowering passes, optimization passes, and other compiler code.
2010-11-15 14:35:46 -08:00
opt_function_inlining.cpp \
opt_if_simplification.cpp \
opt_noop_swizzle.cpp \
glsl2: Add pass to remove redundant jumps
2010-09-13 14:25:26 -07:00
opt_redundant_jumps.cpp \
glsl: Rename various ir_* files to lower_* and opt_*. This helps distinguish between lowering passes, optimization passes, and other compiler code.
2010-11-15 14:35:46 -08:00
opt_structure_splitting.cpp \
opt_swizzle_swizzle.cpp \
opt_tree_grafting.cpp \
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
s_expression.cpp
LIBS = \
$(TOP)/src/glsl/libglsl.a \
mesa: AC_SUBST the talloc libs/cflags so the ./configure results are saved. I had used pkg-config from the Makefile because I didn't want to screw around with the non-autoconf build, but that doesn't work because the PKG_CONFIG_PATH or TALLOC_LIBS/TALLOC_CFLAGS that people set at configure time needs to be respected and may not be present at build time. Bug #29585
2010-08-22 17:34:18 -07:00
$(TALLOC_LIBS)
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
Build a standalone glcpp binary. This is convenient for testing the preprocessor independent of the rest of mesa, (just run glcpp-test in the src/glsl/glcpp/tests).
2010-07-14 14:48:15 -07:00
APPS = glsl_compiler glcpp/glcpp
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
GLSL2_C_SOURCES = \
Merge remote branch 'origin/master' into glsl2 This pulls in multiple i965 driver fixes which will help ensure better testing coverage during development, and also gets past the conflicts of the src/mesa/shader -> src/mesa/program move. Conflicts: src/mesa/Makefile src/mesa/main/shaderapi.c src/mesa/main/shaderobj.h
2010-07-26 17:47:59 -07:00
../mesa/program/hash_table.c \
../mesa/program/symbol_table.c
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
GLSL2_CXX_SOURCES = \
main.cpp
GLSL2_OBJECTS = \
$(GLSL2_C_SOURCES:.c=.o) \
$(GLSL2_CXX_SOURCES:.cpp=.o)
### Basic defines ###
glsl2/Makefile: Append to DEFINES rather than replacing them. Otherwise, we lose DEBUG, which causes mtypes.h to set NDEBUG, which causes assertions to not happen, which is no fun for anyone.
2010-07-28 16:44:56 -07:00
DEFINES += \
glsl2: Add the API defines to the glsl2 build so we get the right GLcontext Fixes: draw_buffers-08.frag draw_buffers-09.frag glsl-vs-texturematrix-2
2010-07-22 15:17:23 -07:00
$(LIBRARY_DEFINES) \
$(API_DEFINES)
Build a standalone glcpp binary. This is convenient for testing the preprocessor independent of the rest of mesa, (just run glcpp-test in the src/glsl/glcpp/tests).
2010-07-14 14:48:15 -07:00
GLCPP_OBJECTS = \
$(GLCPP_SOURCES:.c=.o) \
Merge remote branch 'origin/master' into glsl2 This pulls in multiple i965 driver fixes which will help ensure better testing coverage during development, and also gets past the conflicts of the src/mesa/shader -> src/mesa/program move. Conflicts: src/mesa/Makefile src/mesa/main/shaderapi.c src/mesa/main/shaderobj.h
2010-07-26 17:47:59 -07:00
../mesa/program/hash_table.o
Build a standalone glcpp binary. This is convenient for testing the preprocessor independent of the rest of mesa, (just run glcpp-test in the src/glsl/glcpp/tests).
2010-07-14 14:48:15 -07:00
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
OBJECTS = \
$(C_SOURCES:.c=.o) \
$(CXX_SOURCES:.cpp=.o)
INCLUDES = \
mesa: AC_SUBST the talloc libs/cflags so the ./configure results are saved. I had used pkg-config from the Makefile because I didn't want to screw around with the non-autoconf build, but that doesn't work because the PKG_CONFIG_PATH or TALLOC_LIBS/TALLOC_CFLAGS that people set at configure time needs to be respected and may not be present at build time. Bug #29585
2010-08-22 17:34:18 -07:00
$(TALLOC_CFLAGS) \
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
-I. \
-I../mesa \
-I../mapi \
glsl2: Add a constructor for _mesa_glsl_parse_state Coming changes to the handling of built-in functions necessitate this.
2010-07-18 15:59:43 -07:00
-I../../include \
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
$(LIBRARY_INCLUDES)
glsl2: Fix dependencies. (at least partially)
2010-06-25 12:23:20 -07:00
ALL_SOURCES = \
$(C_SOURCES) \
$(CXX_SOURCES) \
$(GLSL2_CXX_SOURCES) \
$(GLSL2_C_SOURCES)
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
##### TARGETS #####
default: depend lib$(LIBNAME).a $(APPS)
lib$(LIBNAME).a: $(OBJECTS) Makefile $(TOP)/src/glsl/Makefile.template
$(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS)
glsl2: Fix dependencies. (at least partially)
2010-06-25 12:23:20 -07:00
depend: $(ALL_SOURCES) Makefile
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
rm -f depend
touch depend
glsl2: Fix dependencies. (at least partially)
2010-06-25 12:23:20 -07:00
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
# Remove .o and backup files
clean:
glsl: make 'make clean' work properly. this has make clean remove all the objects.
2010-08-24 16:10:28 +10:00
rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
-rm -f $(APPS)
# Dummy target
install:
@echo -n ""
##### RULES #####
glsl_compiler: $(GLSL2_OBJECTS) libglsl.a
$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) $(LIBS) -o $@
Build a standalone glcpp binary. This is convenient for testing the preprocessor independent of the rest of mesa, (just run glcpp-test in the src/glsl/glcpp/tests).
2010-07-14 14:48:15 -07:00
glcpp/glcpp: $(GLCPP_OBJECTS) libglsl.a
$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) $(LIBS) -o $@
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
.cpp.o:
glsl2: Add the API defines to the glsl2 build so we get the right GLcontext Fixes: draw_buffers-08.frag draw_buffers-09.frag glsl-vs-texturematrix-2
2010-07-22 15:17:23 -07:00
$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
.c.o:
glsl2: Add the API defines to the glsl2 build so we get the right GLcontext Fixes: draw_buffers-08.frag draw_buffers-09.frag glsl-vs-texturematrix-2
2010-07-22 15:17:23 -07:00
$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
glsl_lexer.cpp: glsl_lexer.lpp
glsl2: Use --nounistd to fix MSVC build Also remove the --never-interactive command line option for the preprocessor lexer. This was already done for main compiler lexer.
2010-08-13 13:08:54 -07:00
flex --nounistd -o$@ $<
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
glsl_parser.cpp: glsl_parser.ypp
glsl2: Use bison command line option to set prefix Bison version 2.3 doesn't seem to support %name-prefix in the source. This should fix bugzilla #29207.
2010-08-11 17:14:02 -07:00
bison -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
glsl2: Use --nounistd to fix MSVC build Also remove the --never-interactive command line option for the preprocessor lexer. This was already done for main compiler lexer.
2010-08-13 13:08:54 -07:00
flex --nounistd -o$@ $<
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
glsl2/Makefile: Add a 'make builtins' target. This copies over a dummy builtin_functions.cpp and rebuilds a bootstrapped version of the compiler, then uses that to generate the proper list of builtins. Finally, it rebuilds the compiler with the new list. Unfortunately, it's no longer automatic, but at least it works.
2010-08-13 17:46:25 -07:00
builtins: builtin_function.cpp builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py
@echo Bootstrapping the compiler...
glsl2: Rework builtin function generation. Each language version/extension and target now has a "profile" containing all of the available builtin function prototypes. These are written in GLSL, and come directly out of the GLSL spec (except for expanding genType). A new builtins/ir/ folder contains the hand-written IR for each builtin, regardless of what version includes it. Only those definitions that have prototypes in the profile will be included. The autogenerated IR for texture builtins is no longer written to disk, so there's no longer any confusion as to what's hand-written or generated. All scripts are now in python instead of perl.
2010-08-11 16:53:52 -07:00
cp builtins/tools/builtin_function.cpp .
glsl2/Makefile: Add a 'make builtins' target. This copies over a dummy builtin_functions.cpp and rebuilds a bootstrapped version of the compiler, then uses that to generate the proper list of builtins. Finally, it rebuilds the compiler with the new list. Unfortunately, it's no longer automatic, but at least it works.
2010-08-13 17:46:25 -07:00
make glsl_compiler
@echo Regenerating builtin_function.cpp...
Fix build on systems where "python" is python 3. First, it changes autoconf to use a "python2" binary when available, rather than plain "python" (which is ambiguous). Secondly, it changes the Makefiles to use $(PYTHON) $(PYTHON_FLAGS) rather than calling python directly. Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com> Signed-off-by: Matthew William Cox <matt@mattcox.ca> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2010-10-25 13:52:58 -07:00
$(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py > builtin_function.cpp
glsl2/Makefile: Add a 'make builtins' target. This copies over a dummy builtin_functions.cpp and rebuilds a bootstrapped version of the compiler, then uses that to generate the proper list of builtins. Finally, it rebuilds the compiler with the new list. Unfortunately, it's no longer automatic, but at least it works.
2010-08-13 17:46:25 -07:00
@echo Rebuilding the real compiler...
make glsl_compiler
glsl2: Replace the GLSL compiler with the glsl2 project.
2010-06-21 11:29:15 -07:00
-include depend
Reference in a new issue Copy permalink