swr: [rasterizer core] fix primID provoking vertex for GS
[mesa.git] / src / gallium / drivers / swr / Makefile.am
index b1ff4233b5664a49234ed3011fc0aef956a64f06..b22ded0a191d317afda5720b82bface296b9678e 100644 (file)
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) -std=c++11
+AM_CXXFLAGS = $(GALLIUM_DRIVER_CFLAGS) $(SWR_CXX11_CXXFLAGS)
 
 noinst_LTLIBRARIES = libmesaswr.la
 
 libmesaswr_la_SOURCES = $(LOADER_SOURCES)
 
 COMMON_CXXFLAGS = \
+       -fno-strict-aliasing \
        $(GALLIUM_DRIVER_CFLAGS) \
        $(LLVM_CXXFLAGS) \
-       -std=c++11 \
+       $(SWR_CXX11_CXXFLAGS) \
        -I$(builddir)/rasterizer/scripts \
        -I$(builddir)/rasterizer/jitter \
+       -I$(builddir)/rasterizer/archrast \
        -I$(srcdir)/rasterizer \
        -I$(srcdir)/rasterizer/core \
-       -I$(srcdir)/rasterizer/jitter
+       -I$(srcdir)/rasterizer/scripts \
+       -I$(srcdir)/rasterizer/jitter \
+       -I$(srcdir)/rasterizer/archrast
 
 COMMON_SOURCES = \
        $(CXX_SOURCES) \
+       $(ARCHRAST_CXX_SOURCES) \
        $(COMMON_CXX_SOURCES) \
        $(CORE_CXX_SOURCES) \
        $(JITTER_CXX_SOURCES) \
@@ -47,78 +52,225 @@ COMMON_SOURCES = \
        $(BUILT_SOURCES)
 
 BUILT_SOURCES = \
+       swr_context_llvm.h \
        rasterizer/scripts/gen_knobs.cpp \
        rasterizer/scripts/gen_knobs.h \
        rasterizer/jitter/state_llvm.h \
-       rasterizer/jitter/builder_gen.h \
-       rasterizer/jitter/builder_gen.cpp \
        rasterizer/jitter/builder_x86.h \
-       rasterizer/jitter/builder_x86.cpp
+       rasterizer/jitter/builder_x86.cpp \
+       rasterizer/archrast/gen_ar_event.h \
+       rasterizer/archrast/gen_ar_event.cpp \
+       rasterizer/archrast/gen_ar_eventhandler.h \
+       rasterizer/archrast/gen_ar_eventhandlerfile.h
+
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h
+       $(PYTHON_GEN) \
+               $(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
+               --input $(srcdir)/swr_context.h \
+               --output swr_context_llvm.h
+
+rasterizer/scripts/gen_knobs.cpp: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
+               $(srcdir)/rasterizer/scripts/gen_knobs.py \
+               --input $(srcdir)/rasterizer/scripts/templates/knobs.template \
+               --output rasterizer/scripts/gen_knobs.cpp \
+               --gen_cpp
 
-rasterizer/scripts/gen_knobs.cpp rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
-       $(PYTHON2) $(PYTHON_FLAGS) \
+rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
                $(srcdir)/rasterizer/scripts/gen_knobs.py \
-               rasterizer/scripts
+               --input $(srcdir)/rasterizer/scripts/templates/knobs.template \
+               --output rasterizer/scripts/gen_knobs.h \
+               --gen_h
 
 rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
-       $(PYTHON2) $(PYTHON_FLAGS) \
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
                $(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
                --input $(srcdir)/rasterizer/core/state.h \
                --output rasterizer/jitter/state_llvm.h
 
-rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
-       $(PYTHON2) $(PYTHON_FLAGS) \
+rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
                $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
                --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
                --output rasterizer/jitter/builder_gen.h \
                --gen_h
 
-rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h
-       $(PYTHON2) $(PYTHON_FLAGS) \
+rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
                $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
                --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
                --output rasterizer/jitter/builder_gen.cpp \
                --gen_cpp
 
 rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
-       $(PYTHON2) $(PYTHON_FLAGS) \
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
                $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
                --output rasterizer/jitter/builder_x86.h \
                --gen_x86_h
 
 rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
-       $(PYTHON2) $(PYTHON_FLAGS) \
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
                $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
                --output rasterizer/jitter/builder_x86.cpp \
                --gen_x86_cpp
 
+rasterizer/archrast/gen_ar_event.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_h.template rasterizer/archrast/events.proto
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
+               $(srcdir)/rasterizer/scripts/gen_archrast.py \
+               --proto $(srcdir)/rasterizer/archrast/events.proto \
+               --output rasterizer/archrast/gen_ar_event.h \
+               --gen_event_h
+
+rasterizer/archrast/gen_ar_event.cpp: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_cpp.template rasterizer/archrast/events.proto
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
+               $(srcdir)/rasterizer/scripts/gen_archrast.py \
+               --proto $(srcdir)/rasterizer/archrast/events.proto \
+               --output rasterizer/archrast/gen_ar_event.cpp \
+               --gen_event_cpp
+
+rasterizer/archrast/gen_ar_eventhandler.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandler_h.template rasterizer/archrast/events.proto
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
+               $(srcdir)/rasterizer/scripts/gen_archrast.py \
+               --proto $(srcdir)/rasterizer/archrast/events.proto \
+               --output rasterizer/archrast/gen_ar_eventhandler.h \
+               --gen_eventhandler_h
+
+rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandlerfile_h.template rasterizer/archrast/events.proto
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) \
+               $(srcdir)/rasterizer/scripts/gen_archrast.py \
+               --proto $(srcdir)/rasterizer/archrast/events.proto \
+               --output rasterizer/archrast/gen_ar_eventhandlerfile.h \
+               --gen_eventhandlerfile_h
 
 COMMON_LIBADD = \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(top_builddir)/src/mesa/libmesagallium.la
+       $(top_builddir)/src/mesa/libmesagallium.la \
+       $(LLVM_LIBS)
+
+COMMON_LDFLAGS = \
+       -shared \
+       -module \
+       -no-undefined \
+       $(GC_SECTIONS) \
+       $(NO_UNDEFINED) \
+       $(LLVM_LDFLAGS)
+
+
+# XXX: As we cannot use BUILT_SOURCES (the files will end up in the dist
+# tarball) just annotate the dependency directly.
+# As the single direct user of builder_gen.h is a header (builder.h) trace all
+# the translusive users (one that use the latter header).
+rasterizer/jitter/blend_jit.cpp: rasterizer/jitter/builder_gen.h
+rasterizer/jitter/builder.cpp: rasterizer/jitter/builder_gen.h
+rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/builder_gen.h
+rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/builder_gen.h
+rasterizer/jitter/builder_misc.cpp: rasterizer/jitter/builder_gen.h
+rasterizer/jitter/fetch_jit.cpp: rasterizer/jitter/builder_gen.h
+rasterizer/jitter/streamout_jit.cpp: rasterizer/jitter/builder_gen.h
+swr_shader.cpp: rasterizer/jitter/builder_gen.h
+
+CLEANFILES = \
+       rasterizer/jitter/builder_gen.h \
+       rasterizer/jitter/builder_gen.cpp
+
+# XXX: Due to the funky dependencies above, the builder_x86.cpp file gets
+# generated (copied) into builddir when building from release tarball.
+# Add a temporary workaround to remove it, until the above issue is resolved.
+distclean-local:
+       ( test $(top_srcdir) != $(top_builddir) && \
+               rm $(builddir)/rasterizer/jitter/builder_x86.cpp ) || true
 
 lib_LTLIBRARIES = libswrAVX.la libswrAVX2.la
 
 libswrAVX_la_CXXFLAGS = \
-       -march=core-avx-i \
+       $(SWR_AVX_CXXFLAGS) \
        -DKNOB_ARCH=KNOB_ARCH_AVX \
        $(COMMON_CXXFLAGS)
 
 libswrAVX_la_SOURCES = \
        $(COMMON_SOURCES)
 
+# XXX: Don't ship these generated sources for now, since they are specific
+# to the LLVM version they are generated from. Thus a release tarball
+# containing the said files, generated against eg. LLVM 3.8 will fail to build
+# on systems with other versions of LLVM eg. 3.7 or 3.6.
+# Move these back to BUILT_SOURCES once that is resolved.
+nodist_libswrAVX_la_SOURCES = \
+       rasterizer/jitter/builder_gen.h \
+       rasterizer/jitter/builder_gen.cpp
+
 libswrAVX_la_LIBADD = \
        $(COMMON_LIBADD)
 
+libswrAVX_la_LDFLAGS = \
+       $(COMMON_LDFLAGS)
+
 libswrAVX2_la_CXXFLAGS = \
-       -march=core-avx2 \
+       $(SWR_AVX2_CXXFLAGS) \
        -DKNOB_ARCH=KNOB_ARCH_AVX2 \
        $(COMMON_CXXFLAGS)
 
 libswrAVX2_la_SOURCES = \
        $(COMMON_SOURCES)
 
+# XXX: Don't ship these generated sources for now, since they are specific
+# to the LLVM version they are generated from. Thus a release tarball
+# containing the said files, generated against eg. LLVM 3.8 will fail to build
+# on systems with other versions of LLVM eg. 3.7 or 3.6.
+# Move these back to BUILT_SOURCES once that is resolved.
+nodist_libswrAVX2_la_SOURCES = \
+       rasterizer/jitter/builder_gen.h \
+       rasterizer/jitter/builder_gen.cpp
+
 libswrAVX2_la_LIBADD = \
        $(COMMON_LIBADD)
 
+libswrAVX2_la_LDFLAGS = \
+       $(COMMON_LDFLAGS)
+
 include $(top_srcdir)/install-gallium-links.mk
+
+EXTRA_DIST = \
+       SConscript \
+       rasterizer/archrast/events.proto \
+       rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
+       rasterizer/jitter/scripts/gen_llvm_types.py \
+       rasterizer/scripts/gen_archrast.py \
+       rasterizer/scripts/gen_knobs.py \
+       rasterizer/scripts/knob_defs.py \
+       rasterizer/scripts/mako/ast.py \
+       rasterizer/scripts/mako/_ast_util.py \
+       rasterizer/scripts/mako/cache.py \
+       rasterizer/scripts/mako/cmd.py \
+       rasterizer/scripts/mako/codegen.py \
+       rasterizer/scripts/mako/compat.py \
+       rasterizer/scripts/mako/exceptions.py \
+       rasterizer/scripts/mako/filters.py \
+       rasterizer/scripts/mako/__init__.py \
+       rasterizer/scripts/mako/lexer.py \
+       rasterizer/scripts/mako/lookup.py \
+       rasterizer/scripts/mako/parsetree.py \
+       rasterizer/scripts/mako/pygen.py \
+       rasterizer/scripts/mako/pyparser.py \
+       rasterizer/scripts/mako/runtime.py \
+       rasterizer/scripts/mako/template.py \
+       rasterizer/scripts/mako/util.py \
+       rasterizer/scripts/templates/knobs.template \
+       rasterizer/scripts/templates/ar_event_h.template \
+       rasterizer/scripts/templates/ar_event_cpp.template \
+       rasterizer/scripts/templates/ar_eventhandler_h.template \
+       rasterizer/scripts/templates/ar_eventhandlerfile_h.template