Commit 272bef06 authored by Jordan Justen's avatar Jordan Justen

intel: Split gen_device_info out into libintel_dev

Split out the device info so isl doesn't depend on intel/common. Now
it will depend on the new intel/dev device info lib.

This will allow the decoder in intel/common to use isl, allowing us to
apply Ken's patch that removes the genxml duplication of surface
formats.
Signed-off-by: Jordan Justen's avatarJordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez's avatarSamuel Iglesias Gonsálvez <siglesias@igalia.com>
parent 9a0d7bb4
# Copyright © 2016 Intel Corporation
# Copyright © 2016 Mauro Rossi <issor.oruam@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)
......@@ -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
......
# 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
......@@ -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
......
......@@ -14,8 +14,6 @@ COMMON_FILES = \
common/gen_decoder.c \
common/gen_decoder.h \
common/gen_defines.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 \
......@@ -124,6 +122,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 \
......
......@@ -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)
......
......@@ -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 \
......
......@@ -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"
......
......@@ -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
......
......@@ -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.
......
......@@ -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',
......
......@@ -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"
......
......@@ -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" {
......
......@@ -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)
......
# 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],
)
......@@ -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)">
......
......@@ -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)
......
......@@ -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;
......
......@@ -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"
......
......@@ -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
......@@ -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"
......
......@@ -21,6 +21,7 @@
inc_intel = include_directories('.')
subdir('blorp')
subdir('dev')
subdir('genxml')
subdir('common')
subdir('isl')
......
......@@ -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" {
......
......@@ -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'),
......
......@@ -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"
......
......@@ -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,
......
......@@ -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 \
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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],
)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment