android,autotools,i965: Fix location of float64_glsl.h

[mesa.git] / src / mesa / drivers / dri / i965 / Makefile.am

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 4b56b4b0efecdfa469de997dbdd0510790d5172b..0bda2897e8e6e171b1fdd9de58ee003a79d002fb 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -26,23 +26,28 @@ include Makefile.sources
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/ \
+       -I$(top_builddir)/src/ \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
+       -I$(top_builddir)/src/util \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_srcdir)/src/gtest/include \
+       -I$(top_builddir)/src/compiler \
+       -I$(top_srcdir)/src/compiler \
        -I$(top_builddir)/src/compiler/glsl \
        -I$(top_builddir)/src/compiler/nir \
        -I$(top_srcdir)/src/compiler/nir \
        -I$(top_builddir)/src/intel \
        -I$(top_srcdir)/src/intel \
-       -I$(top_srcdir)/src/intel/drm \
+       -I$(top_srcdir)/include/drm-uapi \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS) \
+       $(WNO_OVERRIDE_INIT) \
        $(LIBDRM_CFLAGS) \
-       $(VALGRIND_CFLAGS)
+       $(VALGRIND_CFLAGS) \
+       -msse2 -mstackrealign
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
@@ -55,7 +60,8 @@ I965_PERGEN_LIBS = \
        libi965_gen75.la \
        libi965_gen8.la \
        libi965_gen9.la \
-       libi965_gen10.la
+       libi965_gen10.la \
+       libi965_gen11.la
 
 libi965_gen4_la_SOURCES = $(i965_gen4_FILES)
 libi965_gen4_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=40
@@ -84,6 +90,9 @@ libi965_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
 libi965_gen10_la_SOURCES = $(i965_gen10_FILES)
 libi965_gen10_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=100
 
+libi965_gen11_la_SOURCES = $(i965_gen11_FILES)
+libi965_gen11_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=110
+
 noinst_LTLIBRARIES = \
        libi965_dri.la \
        $(I965_PERGEN_LIBS)
@@ -93,6 +102,7 @@ libi965_dri_la_SOURCES = \
        $(i965_oa_GENERATED_FILES)
 libi965_dri_la_LIBADD = \
        $(top_builddir)/src/intel/common/libintel_common.la \
+       $(top_builddir)/src/intel/dev/libintel_dev.la \
        $(top_builddir)/src/intel/isl/libisl.la \
        $(top_builddir)/src/intel/compiler/libintel_compiler.la \
        $(top_builddir)/src/intel/blorp/libblorp.la \
@@ -103,23 +113,14 @@ BUILT_SOURCES = $(i965_oa_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
-       brw_oa_hsw.xml \
-       brw_oa_bdw.xml \
-       brw_oa_chv.xml \
-       brw_oa_sklgt2.xml \
-       brw_oa_sklgt3.xml \
-       brw_oa_sklgt4.xml \
-       brw_oa_bxt.xml \
-       brw_oa_kblgt2.xml \
-       brw_oa_kblgt3.xml \
-       brw_oa_glk.xml \
-       brw_oa.py
-
-# Note: we avoid using a multi target rule here and outputting both the
-# .c and .h files in one go so we don't hit problems with parallel
-# make and multiple invocations of the same script trying to write
-# to the same files.
-brw_oa_%.h: brw_oa.py brw_oa_%.xml Makefile.am
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py --header=$(builddir)/brw_oa_$(*).h --chipset=$(*) $(srcdir)/brw_oa_$(*).xml
-brw_oa_%.c: brw_oa.py brw_oa_%.xml Makefile.am
-       $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py --code=$(builddir)/brw_oa_$(*).c --chipset=$(*) $(srcdir)/brw_oa_$(*).xml
+       brw_oa.py \
+       $(i965_oa_xml_FILES) \
+       meson.build
+
+brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
+       $(PYTHON) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py \
+       --code=$(builddir)/brw_oa_metrics.c \
+       --header=$(builddir)/brw_oa_metrics.h \
+       $(i965_oa_xml_FILES:%=$(srcdir)/%)
+
+brw_oa_metrics.h: brw_oa_metrics.c