Jordan Justen <jordan.l.jus...@intel.com> writes: > On 2018-02-28 01:58:24, Samuel Iglesias Gonsálvez wrote: >> What is the idea for src/intel/dev/ ? >> >> I'm not against this patch, just asking. > > Ken noticed a lot of duplicate lines in the xml for surface formats. > (Patch 4). But, then we noticed that removing them makes aubinator > fail to nicely print out the surface format name. >
Isn't it a bit of a misfeature for the surface formats not to be
represented in the XML anymore? Why should one need to depend on isl in
order to decode a batchbuffer?
> I thought maybe we could have isl help get the format name, but then
> Jason pointed out that isl depends on intel/common (for device info),
> so we couldn't make the decoder code in intel/common depend on isl.
>
Did you consider splitting off the decoder code from common if it really
needs to depend on isl?
> My idea is to split out the device info so isl wouldn't have to depend
> on intel/common, and now it will depend on the newer intel/dev device
> info lib. This should allow the decoder in intel/common to use isl,
> and then we can remove the genxml duplication.
>
> -Jordan
>
>> Patches 2-4 are,
>>
>> Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com>
>>
>> Sam
>>
>>
>> On 27/02/18 21:32, Jordan Justen wrote:
>> > Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com>
>> > ---
>> > src/intel/Android.dev.mk | 35
>> > ++++++++++++++++++++++
>> > src/intel/Makefile.am | 1 +
>> > src/intel/Makefile.dev.am | 31
>> > +++++++++++++++++++
>> > src/intel/Makefile.isl.am | 2 +-
>> > src/intel/Makefile.sources | 6 ++--
>> > src/intel/Makefile.tools.am | 4 +++
>> > src/intel/Makefile.vulkan.am | 1 +
>> > src/intel/blorp/blorp_genX_exec.h | 2 +-
>> > src/intel/common/gen_decoder.h | 2 +-
>> > src/intel/common/gen_l3_config.h | 2 +-
>> > src/intel/common/meson.build | 2 --
>> > src/intel/compiler/brw_compiler.h | 2 +-
>> > src/intel/compiler/brw_inst.h | 2 +-
>> > src/intel/compiler/brw_reg_type.c | 2 +-
>> > src/intel/{common => dev}/gen_device_info.c | 0
>> > src/intel/{common => dev}/gen_device_info.h | 0
>> > src/intel/dev/meson.build | 33
>> > ++++++++++++++++++++
>> > src/intel/genxml/gen_bits_header.py | 2 +-
>> > src/intel/isl/isl_drm.c | 2 +-
>> > src/intel/isl/isl_format.c | 2 +-
>> > src/intel/isl/isl_priv.h | 2 +-
>> > src/intel/isl/meson.build | 2 +-
>> > .../isl/tests/isl_surf_get_image_offset_test.c | 2 +-
>> > src/intel/meson.build | 1 +
>> > src/intel/tools/gen_disasm.h | 2 +-
>> > src/intel/tools/meson.build | 4 +--
>> > src/intel/vulkan/anv_private.h | 2 +-
>> > src/intel/vulkan/meson.build | 8 ++---
>> > src/mesa/drivers/dri/i965/Makefile.am | 1 +
>> > src/mesa/drivers/dri/i965/brw_bufmgr.c | 2 +-
>> > src/mesa/drivers/dri/i965/genX_state_upload.c | 2 +-
>> > src/mesa/drivers/dri/i965/intel_screen.h | 2 +-
>> > src/mesa/drivers/dri/i965/meson.build | 3 +-
>> > 33 files changed, 137 insertions(+), 29 deletions(-)
>> > create mode 100644 src/intel/Android.dev.mk
>> > create mode 100644 src/intel/Makefile.dev.am
>> > rename src/intel/{common => dev}/gen_device_info.c (100%)
>> > rename src/intel/{common => dev}/gen_device_info.h (100%)
>> > create mode 100644 src/intel/dev/meson.build
>> >
>> > diff --git a/src/intel/Android.dev.mk b/src/intel/Android.dev.mk
>> > new file mode 100644
>> > index 00000000000..956f32c119f
>> > --- /dev/null
>> > +++ b/src/intel/Android.dev.mk
>> > @@ -0,0 +1,35 @@
>> > +# Copyright © 2016 Intel Corporation
>> > +# Copyright © 2016 Mauro Rossi <issor.or...@gmail.com>
>> > +#
>> > +# 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 libmesa_intel_dev
>> > +# ---------------------------------------
>> > +
>> > +include $(CLEAR_VARS)
>> > +
>> > +LOCAL_MODULE := libmesa_intel_dev
>> > +
>> > +LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>> > +
>> > +LOCAL_SRC_FILES := $(DEV_FILES)
>> > +
>> > +include $(MESA_COMMON_MK)
>> > +include $(BUILD_STATIC_LIBRARY)
>> > diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
>> > index cde4a70fbc6..bfb7f5b9f08 100644
>> > --- a/src/intel/Makefile.am
>> > +++ b/src/intel/Makefile.am
>> > @@ -75,6 +75,7 @@ EXTRA_DIST = \
>> > include Makefile.blorp.am
>> > include Makefile.common.am
>> > include Makefile.compiler.am
>> > +include Makefile.dev.am
>> > include Makefile.genxml.am
>> > include Makefile.isl.am
>> > include Makefile.tools.am
>> > diff --git a/src/intel/Makefile.dev.am b/src/intel/Makefile.dev.am
>> > new file mode 100644
>> > index 00000000000..2bf5b4e232a
>> > --- /dev/null
>> > +++ b/src/intel/Makefile.dev.am
>> > @@ -0,0 +1,31 @@
>> > +# 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 += dev/libintel_dev.la
>> > +
>> > +dev_libintel_dev_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) $(EXPAT_CFLAGS)
>> > +dev_libintel_dev_la_SOURCES = $(DEV_FILES)
>> > +dev_libintel_dev_la_LIBADD = $(EXPAT_LIBS)
>> > +
>> > +if HAVE_PLATFORM_ANDROID
>> > +dev_libintel_dev_la_CFLAGS += $(ANDROID_CFLAGS)
>> > +dev_libintel_dev_la_LIBADD += $(ANDROID_LIBS)
>> > +endif
>> > diff --git a/src/intel/Makefile.isl.am b/src/intel/Makefile.isl.am
>> > index 9525f9e9905..52a71cffd4b 100644
>> > --- a/src/intel/Makefile.isl.am
>> > +++ b/src/intel/Makefile.isl.am
>> > @@ -80,7 +80,7 @@ check_PROGRAMS +=
>> > isl/tests/isl_surf_get_image_offset_test
>> > TESTS += $(check_PROGRAMS)
>> >
>> > isl_tests_isl_surf_get_image_offset_test_LDADD = \
>> > - common/libintel_common.la \
>> > + dev/libintel_dev.la \
>> > isl/libisl.la \
>> > -lm
>> >
>> > diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
>> > index 692c8604770..c6ae408edc5 100644
>> > --- a/src/intel/Makefile.sources
>> > +++ b/src/intel/Makefile.sources
>> > @@ -13,8 +13,6 @@ COMMON_FILES = \
>> > common/gen_debug.h \
>> > common/gen_decoder.c \
>> > common/gen_decoder.h \
>> > - common/gen_device_info.c \
>> > - common/gen_device_info.h \
>> > common/gen_l3_config.c \
>> > common/gen_l3_config.h \
>> > common/gen_urb_config.c \
>> > @@ -123,6 +121,10 @@ COMPILER_FILES = \
>> > COMPILER_GENERATED_FILES = \
>> > compiler/brw_nir_trig_workarounds.c
>> >
>> > +DEV_FILES = \
>> > + dev/gen_device_info.c \
>> > + dev/gen_device_info.h
>> > +
>> > GENXML_XML_FILES = \
>> > genxml/gen4.xml \
>> > genxml/gen45.xml \
>> > diff --git a/src/intel/Makefile.tools.am b/src/intel/Makefile.tools.am
>> > index 944ee19805c..a8685c24e1c 100644
>> > --- a/src/intel/Makefile.tools.am
>> > +++ b/src/intel/Makefile.tools.am
>> > @@ -37,6 +37,8 @@ tools_aubinator_CFLAGS = \
>> > tools_aubinator_LDADD = \
>> > common/libintel_common.la \
>> > compiler/libintel_compiler.la \
>> > + dev/libintel_dev.la \
>> > + isl/libisl.la \
>> > $(top_builddir)/src/util/libmesautil.la \
>> > $(PER_GEN_LIBS) \
>> > $(PTHREAD_LIBS) \
>> > @@ -54,6 +56,8 @@ tools_aubinator_error_decode_SOURCES = \
>> > tools_aubinator_error_decode_LDADD = \
>> > common/libintel_common.la \
>> > compiler/libintel_compiler.la \
>> > + dev/libintel_dev.la \
>> > + isl/libisl.la \
>> > $(top_builddir)/src/util/libmesautil.la \
>> > $(PTHREAD_LIBS) \
>> > $(ZLIB_LIBS)
>> > diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
>> > index 891ee698a02..6b71df6319a 100644
>> > --- a/src/intel/Makefile.vulkan.am
>> > +++ b/src/intel/Makefile.vulkan.am
>> > @@ -152,6 +152,7 @@ VULKAN_LIB_DEPS = \
>> > $(VULKAN_PER_GEN_LIBS) \
>> > compiler/libintel_compiler.la \
>> > common/libintel_common.la \
>> > + dev/libintel_dev.la \
>> > isl/libisl.la \
>> > blorp/libblorp.la \
>> > $(top_builddir)/src/vulkan/libvulkan_util.la \
>> > diff --git a/src/intel/blorp/blorp_genX_exec.h
>> > b/src/intel/blorp/blorp_genX_exec.h
>> > index 737720a70c9..ccf65a7d944 100644
>> > --- a/src/intel/blorp/blorp_genX_exec.h
>> > +++ b/src/intel/blorp/blorp_genX_exec.h
>> > @@ -25,7 +25,7 @@
>> > #define BLORP_GENX_EXEC_H
>> >
>> > #include "blorp_priv.h"
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "common/gen_sample_positions.h"
>> > #include "genxml/gen_macros.h"
>> >
>> > diff --git a/src/intel/common/gen_decoder.h
>> > b/src/intel/common/gen_decoder.h
>> > index ff388700287..7ae80cd23ed 100644
>> > --- a/src/intel/common/gen_decoder.h
>> > +++ b/src/intel/common/gen_decoder.h
>> > @@ -28,7 +28,7 @@
>> > #include <stdbool.h>
>> > #include <stdio.h>
>> >
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "util/hash_table.h"
>> >
>> > #ifdef __cplusplus
>> > diff --git a/src/intel/common/gen_l3_config.h
>> > b/src/intel/common/gen_l3_config.h
>> > index 8dc7dda0fcc..33da8bb19de 100644
>> > --- a/src/intel/common/gen_l3_config.h
>> > +++ b/src/intel/common/gen_l3_config.h
>> > @@ -26,7 +26,7 @@
>> >
>> > #include <stdio.h>
>> >
>> > -#include "gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> >
>> > /**
>> > * Chunk of L3 cache reserved for some specific purpose.
>> > diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
>> > index 19472e306f4..d35d5e8f78e 100644
>> > --- a/src/intel/common/meson.build
>> > +++ b/src/intel/common/meson.build
>> > @@ -26,8 +26,6 @@ files_libintel_common = files(
>> > 'gen_debug.h',
>> > 'gen_decoder.c',
>> > 'gen_decoder.h',
>> > - 'gen_device_info.c',
>> > - 'gen_device_info.h',
>> > 'gen_l3_config.c',
>> > 'gen_l3_config.h',
>> > 'gen_urb_config.c',
>> > diff --git a/src/intel/compiler/brw_compiler.h
>> > b/src/intel/compiler/brw_compiler.h
>> > index b1086bbcee5..38dca659188 100644
>> > --- a/src/intel/compiler/brw_compiler.h
>> > +++ b/src/intel/compiler/brw_compiler.h
>> > @@ -25,7 +25,7 @@
>> > #define BRW_COMPILER_H
>> >
>> > #include <stdio.h>
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "main/macros.h"
>> > #include "util/ralloc.h"
>> >
>> > diff --git a/src/intel/compiler/brw_inst.h b/src/intel/compiler/brw_inst.h
>> > index 99e637e6603..74316f5283a 100644
>> > --- a/src/intel/compiler/brw_inst.h
>> > +++ b/src/intel/compiler/brw_inst.h
>> > @@ -36,7 +36,7 @@
>> >
>> > #include "brw_eu_defines.h"
>> > #include "brw_reg_type.h"
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> >
>> > #ifdef __cplusplus
>> > extern "C" {
>> > diff --git a/src/intel/compiler/brw_reg_type.c
>> > b/src/intel/compiler/brw_reg_type.c
>> > index b7fff0867f4..b710e421aef 100644
>> > --- a/src/intel/compiler/brw_reg_type.c
>> > +++ b/src/intel/compiler/brw_reg_type.c
>> > @@ -23,7 +23,7 @@
>> >
>> > #include "brw_reg.h"
>> > #include "brw_eu_defines.h"
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> >
>> > #define INVALID (-1)
>> >
>> > diff --git a/src/intel/common/gen_device_info.c
>> > b/src/intel/dev/gen_device_info.c
>> > similarity index 100%
>> > rename from src/intel/common/gen_device_info.c
>> > rename to src/intel/dev/gen_device_info.c
>> > diff --git a/src/intel/common/gen_device_info.h
>> > b/src/intel/dev/gen_device_info.h
>> > similarity index 100%
>> > rename from src/intel/common/gen_device_info.h
>> > rename to src/intel/dev/gen_device_info.h
>> > diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
>> > new file mode 100644
>> > index 00000000000..3346fe60c07
>> > --- /dev/null
>> > +++ b/src/intel/dev/meson.build
>> > @@ -0,0 +1,33 @@
>> > +# Copyright © 2017 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 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.
>> > +
>> > +# TODO: android?
>> > +
>> > +files_libintel_dev = files(
>> > + 'gen_device_info.c',
>> > + 'gen_device_info.h',
>> > +)
>> > +
>> > +libintel_dev = static_library(
>> > + ['intel_dev'],
>> > + files_libintel_dev,
>> > + include_directories : [inc_common, inc_intel],
>> > + c_args : [c_vis_args, no_override_init_args],
>> > +)
>> > diff --git a/src/intel/genxml/gen_bits_header.py
>> > b/src/intel/genxml/gen_bits_header.py
>> > index 965a74ed893..faba79dcd34 100644
>> > --- a/src/intel/genxml/gen_bits_header.py
>> > +++ b/src/intel/genxml/gen_bits_header.py
>> > @@ -67,7 +67,7 @@ from operator import itemgetter
>> >
>> > #include <stdint.h>
>> >
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "util/macros.h"
>> >
>> > <%def name="emit_per_gen_prop_func(item, prop)">
>> > diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c
>> > index 31895e15e16..e16d7b63917 100644
>> > --- a/src/intel/isl/isl_drm.c
>> > +++ b/src/intel/isl/isl_drm.c
>> > @@ -28,7 +28,7 @@
>> > #include <i915_drm.h>
>> >
>> > #include "isl.h"
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> >
>> > uint32_t
>> > isl_tiling_to_i915_tiling(enum isl_tiling tiling)
>> > diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
>> > index 03c591071b6..a5bbdbceb1a 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 "common/gen_device_info.h"
>> > +#include "dev/gen_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 b86167bb3af..871518409ee 100644
>> > --- a/src/intel/isl/isl_priv.h
>> > +++ b/src/intel/isl/isl_priv.h
>> > @@ -27,7 +27,7 @@
>> > #include <assert.h>
>> > #include <strings.h>
>> >
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "util/macros.h"
>> >
>> > #include "isl.h"
>> > diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
>> > index 36b8b8ffa20..73a8837f2ad 100644
>> > --- a/src/intel/isl/meson.build
>> > +++ b/src/intel/isl/meson.build
>> > @@ -95,7 +95,7 @@ if with_tests
>> > 'tests/isl_surf_get_image_offset_test.c',
>> > dependencies : dep_m,
>> > include_directories : [inc_common, inc_intel],
>> > - link_with : [libisl, libintel_common],
>> > + link_with : [libisl, libintel_dev],
>> > )
>> > )
>> > endif
>> > 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 05fd79f3a94..16c80c312e9 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 "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "isl/isl.h"
>> > #include "isl/isl_priv.h"
>> >
>> > diff --git a/src/intel/meson.build b/src/intel/meson.build
>> > index 57676082c9d..28a2d793509 100644
>> > --- a/src/intel/meson.build
>> > +++ b/src/intel/meson.build
>> > @@ -21,6 +21,7 @@
>> > inc_intel = include_directories('.')
>> >
>> > subdir('blorp')
>> > +subdir('dev')
>> > subdir('genxml')
>> > subdir('common')
>> > subdir('isl')
>> > diff --git a/src/intel/tools/gen_disasm.h b/src/intel/tools/gen_disasm.h
>> > index 52601cb2864..c8c18b2cf03 100644
>> > --- a/src/intel/tools/gen_disasm.h
>> > +++ b/src/intel/tools/gen_disasm.h
>> > @@ -24,7 +24,7 @@
>> > #ifndef GEN_DISASM_H
>> > #define GEN_DISASM_H
>> >
>> > -#include "intel/common/gen_device_info.h"
>> > +#include "intel/dev/gen_device_info.h"
>> >
>> > #ifdef __cplusplus
>> > extern "C" {
>> > diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
>> > index 82413041b13..84b44841f75 100644
>> > --- a/src/intel/tools/meson.build
>> > +++ b/src/intel/tools/meson.build
>> > @@ -24,7 +24,7 @@ aubinator = executable(
>> > 'gen_disasm.h', 'intel_aub.h'),
>> > dependencies : [dep_expat, dep_zlib, dep_dl, dep_thread, dep_m],
>> > include_directories : [inc_common, inc_intel],
>> > - link_with : [libintel_common, libintel_compiler, libmesa_util],
>> > + link_with : [libintel_common, libintel_compiler, libintel_dev,
>> > libmesa_util],
>> > c_args : [c_vis_args, no_override_init_args],
>> > build_by_default : with_tools.contains('intel'),
>> > install : with_tools.contains('intel'),
>> > @@ -36,7 +36,7 @@ aubinator_error_decode = executable(
>> > 'gen_batch_decoder.c'),
>> > dependencies : [dep_zlib, dep_thread],
>> > include_directories : [inc_common, inc_intel],
>> > - link_with : [libintel_common, libintel_compiler, libmesa_util],
>> > + link_with : [libintel_common, libintel_compiler, libintel_dev,
>> > libmesa_util],
>> > c_args : [c_vis_args, no_override_init_args],
>> > build_by_default : with_tools.contains('intel'),
>> > install : with_tools.contains('intel'),
>> > diff --git a/src/intel/vulkan/anv_private.h
>> > b/src/intel/vulkan/anv_private.h
>> > index fb4fd19178d..11ef6adaf3d 100644
>> > --- a/src/intel/vulkan/anv_private.h
>> > +++ b/src/intel/vulkan/anv_private.h
>> > @@ -42,7 +42,7 @@
>> > #endif
>> >
>> > #include "common/gen_clflush.h"
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "blorp/blorp.h"
>> > #include "compiler/brw_compiler.h"
>> > #include "util/macros.h"
>> > diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
>> > index f0317236702..d45331febe0 100644
>> > --- a/src/intel/vulkan/meson.build
>> > +++ b/src/intel/vulkan/meson.build
>> > @@ -192,8 +192,8 @@ libvulkan_intel = shared_library(
>> > ],
>> > link_whole : [libanv_common, libanv_gen_libs],
>> > link_with : [
>> > - libintel_compiler, libintel_common, libisl, libblorp, libvulkan_util,
>> > - libvulkan_wsi, libmesa_util,
>> > + libintel_compiler, libintel_common, libintel_dev, libisl, libblorp,
>> > + libvulkan_util, libvulkan_wsi, libmesa_util,
>> > ],
>> > dependencies : [
>> > dep_thread, dep_dl, dep_m, anv_deps, idep_nir,
>> > @@ -213,8 +213,8 @@ if with_tests
>> > ],
>> > link_whole : libanv_common,
>> > link_with : [
>> > - libanv_gen_libs, libintel_compiler, libintel_common, libisl,
>> > libblorp,
>> > - libvulkan_util, libvulkan_wsi, libmesa_util,
>> > + libanv_gen_libs, libintel_compiler, libintel_common, libintel_dev,
>> > + libisl, libblorp, libvulkan_util, libvulkan_wsi, libmesa_util,
>> > ],
>> > dependencies : [
>> > dep_thread, dep_dl, dep_m, anv_deps, idep_nir,
>> > diff --git a/src/mesa/drivers/dri/i965/Makefile.am
>> > b/src/mesa/drivers/dri/i965/Makefile.am
>> > index da56f67fa5f..824882389ea 100644
>> > --- a/src/mesa/drivers/dri/i965/Makefile.am
>> > +++ b/src/mesa/drivers/dri/i965/Makefile.am
>> > @@ -99,6 +99,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 \
>> > diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c
>> > b/src/mesa/drivers/dri/i965/brw_bufmgr.c
>> > index fb180289a0c..3ab0a716982 100644
>> > --- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
>> > +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
>> > @@ -54,7 +54,7 @@
>> > #endif
>> > #include "common/gen_clflush.h"
>> > #include "common/gen_debug.h"
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "libdrm_macros.h"
>> > #include "main/macros.h"
>> > #include "util/macros.h"
>> > diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c
>> > b/src/mesa/drivers/dri/i965/genX_state_upload.c
>> > index 8668abd591f..38dc689abdc 100644
>> > --- a/src/mesa/drivers/dri/i965/genX_state_upload.c
>> > +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
>> > @@ -23,7 +23,7 @@
>> >
>> > #include <assert.h>
>> >
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "common/gen_sample_positions.h"
>> > #include "genxml/gen_macros.h"
>> >
>> > diff --git a/src/mesa/drivers/dri/i965/intel_screen.h
>> > b/src/mesa/drivers/dri/i965/intel_screen.h
>> > index a2bce921449..8d56fcd9e7a 100644
>> > --- a/src/mesa/drivers/dri/i965/intel_screen.h
>> > +++ b/src/mesa/drivers/dri/i965/intel_screen.h
>> > @@ -34,7 +34,7 @@
>> > #include "isl/isl.h"
>> > #include "dri_util.h"
>> > #include "brw_bufmgr.h"
>> > -#include "common/gen_device_info.h"
>> > +#include "dev/gen_device_info.h"
>> > #include "i915_drm.h"
>> > #include "util/xmlconfig.h"
>> >
>> > diff --git a/src/mesa/drivers/dri/i965/meson.build
>> > b/src/mesa/drivers/dri/i965/meson.build
>> > index e6866147d9f..b0bf40351da 100644
>> > --- a/src/mesa/drivers/dri/i965/meson.build
>> > +++ b/src/mesa/drivers/dri/i965/meson.build
>> > @@ -174,7 +174,8 @@ libi965 = static_library(
>> > c_args : [c_vis_args, no_override_init_args, '-msse2'],
>> > cpp_args : [cpp_vis_args, '-msse2'],
>> > link_with : [
>> > - i965_gen_libs, libintel_common, libisl, libintel_compiler, libblorp,
>> > + i965_gen_libs, libintel_common, libintel_dev, libisl,
>> > libintel_compiler,
>> > + libblorp,
>> > ],
>> > dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
>> > )
>>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
