<div dir="ltr">+Mauro </div><div class="gmail_extra"> <div class="gmail_quote">On Wed, Aug 31, 2016 at 1:56 PM, Jason Ekstrand <<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The first thing to go in this new library is brw_device_info. Signed-off-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> Cc: Rob Herring <<a href="mailto:robh@kernel.org">robh@kernel.org</a>> --- The android build files I just copied-and-pasted from blorp but I don't have an android build setup so I can't test them. src/intel/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> | 37 ++++++++++++++++++++++ src/intel/Android.mk | 1 + src/intel/Makefile.am | 1 + src/intel/<a href="http://Makefile.common.am" rel="noreferrer" target="_blank">Makefile.common.am</a> | 24 ++++++++++++++ src/intel/<a href="http://Makefile.isl.am" rel="noreferrer" target="_blank">Makefile.isl.am</a> | 1 + src/intel/Makefile.sources | 4 +++ src/intel/blorp/blorp_genX_exec.h | 2 +- .../dri/i965 => intel/common}/brw_device_info.c | 0 .../dri/i965 => intel/common}/brw_device_info.h | 0 src/intel/isl/isl_format.c | 2 +- src/intel/isl/isl_priv.h | 2 +- .../isl/tests/isl_surf_get_image_offset_test.c | 2 +- src/intel/tools/Makefile.am | 1 + src/intel/vulkan/Makefile.am | 1 + src/intel/vulkan/anv_private.h | 2 +- src/mesa/drivers/dri/i965/Android.mk | 1 + src/mesa/drivers/dri/i965/Makefile.am | 1 + src/mesa/drivers/dri/i965/Makefile.sources | 2 -- src/mesa/drivers/dri/i965/brw_compiler.h | 2 +- src/mesa/drivers/dri/i965/intel_screen.h | 2 +- 20 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 src/intel/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> create mode 100644 src/intel/<a href="http://Makefile.common.am" rel="noreferrer" target="_blank">Makefile.common.am</a> rename src/{mesa/drivers/dri/i965 => intel/common}/brw_device_info.c (100%) rename src/{mesa/drivers/dri/i965 => intel/common}/brw_device_info.h (100%) diff --git a/src/intel/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> b/src/intel/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> new file mode 100644 index 0000000..512bcd7 --- /dev/null +++ b/src/intel/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> @@ -0,0 +1,37 @@ +# Copyright © 2016 Intel Corporation +# Copyright © 2016 Mauro Rossi <<a href="mailto:issor.oruam@gmail.com">issor.oruam@gmail.com</a>> +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# --------------------------------------- +# Build libintel_common +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libintel_common + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES + +LOCAL_SRC_FILES := $(COMMON_FILES) + +LOCAL_C_INCLUDES := + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/src/intel/Android.mk b/src/intel/Android.mk index 0e9c29d..3d501ab 100644 --- a/src/intel/Android.mk +++ b/src/intel/Android.mk @@ -26,5 +26,6 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/Makefile.sources include $(LOCAL_PATH)/<a href="http://Android.blorp.mk" rel="noreferrer" target="_blank">Android.blorp.mk</a> +include $(LOCAL_PATH)/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a> include $(LOCAL_PATH)/<a href="http://Android.genxml.mk" rel="noreferrer" target="_blank">Android.genxml.mk</a> include $(LOCAL_PATH)/<a href="http://Android.isl.mk" rel="noreferrer" target="_blank">Android.isl.mk</a> diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am index fa4570d..9186b5c 100644 --- a/src/intel/Makefile.am +++ b/src/intel/Makefile.am @@ -53,6 +53,7 @@ CLEANFILES = EXTRA_DIST = include <a href="http://Makefile.blorp.am" rel="noreferrer" target="_blank">Makefile.blorp.am</a> +include <a href="http://Makefile.common.am" rel="noreferrer" target="_blank">Makefile.common.am</a> include <a href="http://Makefile.genxml.am" rel="noreferrer" target="_blank">Makefile.genxml.am</a> include <a href="http://Makefile.isl.am" rel="noreferrer" target="_blank">Makefile.isl.am</a> diff --git a/src/intel/<a href="http://Makefile.common.am" rel="noreferrer" target="_blank">Makefile.common.am</a> b/src/intel/<a href="http://Makefile.common.am" rel="noreferrer" target="_blank">Makefile.common.am</a> new file mode 100644 index 0000000..a8be54a --- /dev/null +++ b/src/intel/<a href="http://Makefile.common.am" rel="noreferrer" target="_blank">Makefile.common.am</a> @@ -0,0 +1,24 @@ +# Copyright © 2016 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +noinst_LTLIBRARIES += common/<a href="http://libintel_common.la" rel="noreferrer" target="_blank">libintel_common.la</a> + +common_libintel_common_la_SOURCES = $(COMMON_FILES) diff --git a/src/intel/<a href="http://Makefile.isl.am" rel="noreferrer" target="_blank">Makefile.isl.am</a> b/src/intel/<a href="http://Makefile.isl.am" rel="noreferrer" target="_blank">Makefile.isl.am</a> index 8871684..5a317f5 100644 --- a/src/intel/<a href="http://Makefile.isl.am" rel="noreferrer" target="_blank">Makefile.isl.am</a> +++ b/src/intel/<a href="http://Makefile.isl.am" rel="noreferrer" target="_blank">Makefile.isl.am</a> @@ -72,6 +72,7 @@ check_PROGRAMS += isl/tests/isl_surf_get_image_offset_test TESTS += $(check_PROGRAMS) isl_tests_isl_surf_get_image_offset_test_LDADD = \ + common/<a href="http://libintel_common.la" rel="noreferrer" target="_blank">libintel_common.la</a> \ isl/<a href="http://libisl.la" rel="noreferrer" target="_blank">libisl.la</a> \ $(top_builddir)/src/mesa/drivers/dri/i965/<a href="http://libi965_compiler.la" rel="noreferrer" target="_blank">libi965_compiler.la</a> \ -lm diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index fcf85ea..97f2328 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -6,6 +6,10 @@ BLORP_FILES = \ blorp/blorp_genX_exec.h \ blorp/blorp_priv.h +COMMON_FILES = \ + common/brw_device_info.c \ + common/brw_device_info.h + GENXML_GENERATED_FILES = \ genxml/gen4_pack.h \ genxml/gen45_pack.h \ diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h index 966e4b3..461cfe0 100644 --- a/src/intel/blorp/blorp_genX_exec.h +++ b/src/intel/blorp/blorp_genX_exec.h @@ -22,7 +22,7 @@ */ #include "blorp_priv.h" -#include "brw_device_info.h" +#include "common/brw_device_info.h" #include "intel_aub.h" /** diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c b/src/intel/common/brw_device_info.c similarity index 100% rename from src/mesa/drivers/dri/i965/brw_device_info.c rename to src/intel/common/brw_device_info.c diff --git a/src/mesa/drivers/dri/i965/brw_device_info.h b/src/intel/common/brw_device_info.h similarity index 100% rename from src/mesa/drivers/dri/i965/brw_device_info.h rename to src/intel/common/brw_device_info.h diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c index 8507cc5..c41a0bf 100644 --- a/src/intel/isl/isl_format.c +++ b/src/intel/isl/isl_format.c @@ -24,7 +24,7 @@ #include <assert.h> #include "isl.h" -#include "brw_device_info.h" +#include "common/brw_device_info.h" struct surface_format_info { bool exists; diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h index 3a7af1a..ab9103e 100644 --- a/src/intel/isl/isl_priv.h +++ b/src/intel/isl/isl_priv.h @@ -26,7 +26,7 @@ #include <assert.h> #include <strings.h> -#include "brw_device_info.h" +#include "common/brw_device_info.h" #include "util/macros.h" #include "isl.h" diff --git a/src/intel/isl/tests/isl_surf_get_image_offset_test.c b/src/intel/isl/tests/isl_surf_get_image_offset_test.c index 9015f0e..0c9173d 100644 --- a/src/intel/isl/tests/isl_surf_get_image_offset_test.c +++ b/src/intel/isl/tests/isl_surf_get_image_offset_test.c @@ -26,7 +26,7 @@ #include <stdio.h> #include <stdlib.h> -#include "brw_device_info.h" +#include "common/brw_device_info.h" #include "isl/isl.h" #include "isl/isl_priv.h" diff --git a/src/intel/tools/Makefile.am b/src/intel/tools/Makefile.am index 9f9bb86..5f4d78d 100644 --- a/src/intel/tools/Makefile.am +++ b/src/intel/tools/Makefile.am @@ -37,6 +37,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/intel aubinator_DEPS = \ + $(top_builddir)/src/intel/common/<a href="http://libintel_common.la" rel="noreferrer" target="_blank">libintel_common.la</a> \ $(top_builddir)/src/mesa/drivers/dri/i965/<a href="http://libi965_compiler.la" rel="noreferrer" target="_blank">libi965_compiler.la</a> \ $(top_builddir)/src/util/<a href="http://libmesautil.la" rel="noreferrer" target="_blank">libmesautil.la</a> \ $(PER_GEN_LIBS) \ diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 5491a16..2d20de9 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -117,6 +117,7 @@ VULKAN_LIB_DEPS += \ $(top_builddir)/src/mesa/drivers/dri/i965/<a href="http://libi965_compiler.la" rel="noreferrer" target="_blank">libi965_compiler.la</a> \ $(top_builddir)/src/compiler/nir/<a href="http://libnir.la" rel="noreferrer" target="_blank">libnir.la</a> \ $(top_builddir)/src/util/<a href="http://libmesautil.la" rel="noreferrer" target="_blank">libmesautil.la</a> \ + $(top_builddir)/src/intel/common/<a href="http://libintel_common.la" rel="noreferrer" target="_blank">libintel_common.la</a> \ $(top_builddir)/src/intel/isl/<a href="http://libisl.la" rel="noreferrer" target="_blank">libisl.la</a> \ $(PER_GEN_LIBS) \ $(PTHREAD_LIBS) \ diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index f24020c..74c1e5b 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -40,7 +40,7 @@ #define VG(x) #endif -#include "brw_device_info.h" +#include "common/brw_device_info.h" #include "brw_compiler.h" #include "util/macros.h" #include "util/list.h" diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 335850a..5ff9553 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -183,6 +183,7 @@ LOCAL_SRC_FILES := \ LOCAL_WHOLE_STATIC_LIBRARIES := \ $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \ $(I965_PERGEN_LIBS) \ + libintel_common \ libmesa_blorp \ libmesa_isl diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index 91559c5..a192fc0 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -78,6 +78,7 @@ noinst_LTLIBRARIES = \ libi965_dri_la_SOURCES = $(i965_FILES) libi965_dri_la_LIBADD = \ + $(top_builddir)/src/intel/common/<a href="http://libintel_common.la" rel="noreferrer" target="_blank">libintel_common.la</a> \ $(top_builddir)/src/intel/isl/<a href="http://libisl.la" rel="noreferrer" target="_blank">libisl.la</a> \ <a href="http://libi965_compiler.la" rel="noreferrer" target="_blank">libi965_compiler.la</a> \ $(top_builddir)/src/intel/blorp/<a href="http://libblorp.la" rel="noreferrer" target="_blank">libblorp.la</a> \ diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 9ff5ceb..df90cb4 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -6,8 +6,6 @@ i965_compiler_FILES = \ brw_dead_control_flow.cpp \ brw_dead_control_flow.h \ brw_defines.h \ - brw_device_info.c \ - brw_device_info.h \ brw_disasm.c \ brw_eu.c \ brw_eu_compact.c \ diff --git a/src/mesa/drivers/dri/i965/brw_compiler.h b/src/mesa/drivers/dri/i965/brw_compiler.h index 933ab11..b45fba13 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.h +++ b/src/mesa/drivers/dri/i965/brw_compiler.h @@ -24,7 +24,7 @@ #pragma once #include <stdio.h> -#include "brw_device_info.h" +#include "common/brw_device_info.h" #include "main/mtypes.h" #include "main/macros.h" diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/intel_screen.h index f62b39f..ab1cc28 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.h +++ b/src/mesa/drivers/dri/i965/intel_screen.h @@ -33,7 +33,7 @@ #include "dri_util.h" #include "intel_bufmgr.h" -#include "brw_device_info.h" +#include "common/brw_device_info.h" #include "i915_drm.h" #include "xmlconfig.h" -- 2.5.0.400.gff86faf </blockquote></div> </div>