radeonsi: Don't modify PA_SC_RASTER_CONFIG register value if rb_mask == 0

[mesa.git] / src / gallium / Automake.inc

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 21a4a807eaf992db8934dc618f9cc3ef023b0fa6..95aae50d64b87fedb9957108ea4e53170fccc860 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -1,5 +1,6 @@
 GALLIUM_CFLAGS = \
        -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        $(DEFINES)
@@ -10,36 +11,28 @@ GALLIUM_CFLAGS = \
 # preprocessor is determined by the ordering of the -I flags.
 GALLIUM_DRIVER_CFLAGS = \
        -I$(srcdir)/include \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/src/gallium/winsys \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS)
 
 GALLIUM_DRIVER_CXXFLAGS = \
        -I$(srcdir)/include \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src/gallium/include \
-       -I$(top_srcdir)/src/gallium/auxiliary \
-       -I$(top_srcdir)/src/gallium/drivers \
-       $(DEFINES) \
-       $(VISIBILITY_CXXFLAGS)
-
-GALLIUM_DRI_CFLAGS = \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/gallium/drivers \
        -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
        $(DEFINES) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(VISIBILITY_CXXFLAGS)
 
-GALLIUM_VIDEO_CFLAGS = \
+GALLIUM_TARGET_CFLAGS = \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/loader \
        -I$(top_srcdir)/src/gallium/include \
@@ -51,91 +44,24 @@ GALLIUM_VIDEO_CFLAGS = \
        $(LIBDRM_CFLAGS) \
        $(VISIBILITY_CFLAGS)
 
-
-GALLIUM_DRI_LINKER_FLAGS = \
-       -shared \
-       -shrext .so \
-       -module \
-       -avoid-version \
-       $(GC_SECTIONS)
-
-GALLIUM_XVMC_LINKER_FLAGS = \
-       -shared \
-       -module \
-       -no-undefined \
-       -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
-       $(GC_SECTIONS) \
-       $(LD_NO_UNDEFINED)
-
-GALLIUM_OMX_LINKER_FLAGS = \
-       -shared \
-       -module \
-       -no-undefined \
-       -avoid-version \
-       $(GC_SECTIONS) \
-       $(LD_NO_UNDEFINED)
-
-if HAVE_LD_VERSION_SCRIPT
-GALLIUM_DRI_LINKER_FLAGS += \
-       -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym
-
-GALLIUM_XVMC_LINKER_FLAGS += \
-       -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc.sym
-
-GALLIUM_OMX_LINKER_FLAGS += \
-       -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym
-endif
-
-
 GALLIUM_COMMON_LIB_DEPS = \
        -lm \
        $(CLOCK_LIB) \
        $(PTHREAD_LIBS) \
        $(DLOPEN_LIBS)
 
-GALLIUM_DRI_LIB_DEPS = \
-       $(top_builddir)/src/mesa/libmesagallium.la \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(SELINUX_LIBS) \
-       $(LIBDRM_LIBS) \
-       $(EXPAT_LIBS) \
-       $(GALLIUM_COMMON_LIB_DEPS)
-
-GALLIUM_XVMC_LIB_DEPS = \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
-       $(XVMC_LIBS) \
-       $(LIBDRM_LIBS) \
-       $(GALLIUM_COMMON_LIB_DEPS)
-
-GALLIUM_OMX_LIB_DEPS = \
-       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
-       $(OMX_LIBS) \
-       $(GALLIUM_COMMON_LIB_DEPS)
-
 GALLIUM_WINSYS_CFLAGS = \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS)
 
-if HAVE_MESA_LLVM
-
-GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS)
-GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS)
-GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS)
-
-GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS)
-GALLIUM_XVMC_LIB_DEPS += $(LLVM_LIBS)
-GALLIUM_OMX_LIB_DEPS += $(LLVM_LIBS)
-
-endif
-
 
 GALLIUM_PIPE_LOADER_WINSYS_LIBS = \
-       $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la
+       $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
+       $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la
 
 if HAVE_DRISW
 GALLIUM_PIPE_LOADER_WINSYS_LIBS += \