From f7e36f9f66248e94cc4247e2459d75f6cd32bc46 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Mon, 14 Dec 2015 10:28:18 -0800 Subject: [PATCH] isl: Move it a standalone directory The plan all along was to eventualyl move isl out of the Vulkan directory, because I intended i965 and anvil to share it. A small problem I encountered when attempting to write unit tests for isl precipitated the move. I discovered that it's easier to get isl unit tests to build if I remove the extra, unneeded dependencies injected by src/vulkan/Makefile.am. And the easiest way to remove those unneeded dependencies is to move isl out of src/vulkan. (Unit tests come in subsequent commits). --- configure.ac | 1 + src/Makefile.am | 1 + src/isl/.gitignore | 1 + src/isl/Makefile.am | 67 +++++++++++++++++++ src/{vulkan => isl}/isl.c | 0 src/{vulkan => isl}/isl.h | 0 src/{vulkan => isl}/isl_format_layout.csv | 0 .../isl_format_layout_gen.bash | 0 src/{vulkan => isl}/isl_gen4.c | 0 src/{vulkan => isl}/isl_gen4.h | 0 src/{vulkan => isl}/isl_gen6.c | 0 src/{vulkan => isl}/isl_gen6.h | 0 src/{vulkan => isl}/isl_gen7.c | 0 src/{vulkan => isl}/isl_gen7.h | 0 src/{vulkan => isl}/isl_gen8.c | 0 src/{vulkan => isl}/isl_gen8.h | 0 src/{vulkan => isl}/isl_gen9.c | 0 src/{vulkan => isl}/isl_gen9.h | 0 src/{vulkan => isl}/isl_image.c | 0 src/{vulkan => isl}/isl_priv.h | 0 src/vulkan/.gitignore | 1 - src/vulkan/Makefile.am | 32 ++------- 22 files changed, 75 insertions(+), 28 deletions(-) create mode 100644 src/isl/.gitignore create mode 100644 src/isl/Makefile.am rename src/{vulkan => isl}/isl.c (100%) rename src/{vulkan => isl}/isl.h (100%) rename src/{vulkan => isl}/isl_format_layout.csv (100%) rename src/{vulkan => isl}/isl_format_layout_gen.bash (100%) rename src/{vulkan => isl}/isl_gen4.c (100%) rename src/{vulkan => isl}/isl_gen4.h (100%) rename src/{vulkan => isl}/isl_gen6.c (100%) rename src/{vulkan => isl}/isl_gen6.h (100%) rename src/{vulkan => isl}/isl_gen7.c (100%) rename src/{vulkan => isl}/isl_gen7.h (100%) rename src/{vulkan => isl}/isl_gen8.c (100%) rename src/{vulkan => isl}/isl_gen8.h (100%) rename src/{vulkan => isl}/isl_gen9.c (100%) rename src/{vulkan => isl}/isl_gen9.h (100%) rename src/{vulkan => isl}/isl_image.c (100%) rename src/{vulkan => isl}/isl_priv.h (100%) diff --git a/configure.ac b/configure.ac index c26dbf2e126..6cadd040194 100644 --- a/configure.ac +++ b/configure.ac @@ -2437,6 +2437,7 @@ AC_CONFIG_FILES([Makefile src/glx/apple/Makefile src/glx/tests/Makefile src/gtest/Makefile + src/isl/Makefile src/loader/Makefile src/mapi/Makefile src/mapi/es1api/glesv1_cm.pc diff --git a/src/Makefile.am b/src/Makefile.am index da638a811fb..9f51e444dd0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,6 +54,7 @@ AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) if HAVE_VULKAN +SUBDIRS += isl SUBDIRS += vulkan endif diff --git a/src/isl/.gitignore b/src/isl/.gitignore new file mode 100644 index 00000000000..e9cfd67b94e --- /dev/null +++ b/src/isl/.gitignore @@ -0,0 +1 @@ +/isl_format_layout.c diff --git a/src/isl/Makefile.am b/src/isl/Makefile.am new file mode 100644 index 00000000000..6a5c29c67cb --- /dev/null +++ b/src/isl/Makefile.am @@ -0,0 +1,67 @@ +# Copyright 2015 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. + +SUBDIRS = . + +noinst_LTLIBRARIES = libisl.la + +# The gallium includes are for the util/u_math.h include from main/macros.h +AM_CPPFLAGS = \ + $(INTEL_CFLAGS) \ + $(VALGRIND_CFLAGS) \ + $(DEFINES) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/mesa/drivers/dri/common \ + -I$(top_srcdir)/src/mesa/drivers/dri/i965 \ + -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_builddir)/src + +libisl_la_CFLAGS = $(CFLAGS) -Wno-override-init + +libisl_la_SOURCES = \ + isl.c \ + isl_format_layout.c \ + isl_gen4.c \ + isl_gen4.h \ + isl_gen6.c \ + isl_gen6.h \ + isl_gen7.c \ + isl_gen7.h \ + isl_gen8.c \ + isl_gen8.h \ + isl_gen9.c \ + isl_gen9.h \ + isl_image.c \ + $(NULL) + +BUILT_SOURCES = \ + isl_format_layout.c + +isl_format_layout.c: isl_format_layout_gen.bash \ + isl_format_layout.csv + $(AM_V_GEN)$(srcdir)/isl_format_layout_gen.bash \ + <$(srcdir)/isl_format_layout.csv >$@ + +include $(top_srcdir)/install-lib-links.mk diff --git a/src/vulkan/isl.c b/src/isl/isl.c similarity index 100% rename from src/vulkan/isl.c rename to src/isl/isl.c diff --git a/src/vulkan/isl.h b/src/isl/isl.h similarity index 100% rename from src/vulkan/isl.h rename to src/isl/isl.h diff --git a/src/vulkan/isl_format_layout.csv b/src/isl/isl_format_layout.csv similarity index 100% rename from src/vulkan/isl_format_layout.csv rename to src/isl/isl_format_layout.csv diff --git a/src/vulkan/isl_format_layout_gen.bash b/src/isl/isl_format_layout_gen.bash similarity index 100% rename from src/vulkan/isl_format_layout_gen.bash rename to src/isl/isl_format_layout_gen.bash diff --git a/src/vulkan/isl_gen4.c b/src/isl/isl_gen4.c similarity index 100% rename from src/vulkan/isl_gen4.c rename to src/isl/isl_gen4.c diff --git a/src/vulkan/isl_gen4.h b/src/isl/isl_gen4.h similarity index 100% rename from src/vulkan/isl_gen4.h rename to src/isl/isl_gen4.h diff --git a/src/vulkan/isl_gen6.c b/src/isl/isl_gen6.c similarity index 100% rename from src/vulkan/isl_gen6.c rename to src/isl/isl_gen6.c diff --git a/src/vulkan/isl_gen6.h b/src/isl/isl_gen6.h similarity index 100% rename from src/vulkan/isl_gen6.h rename to src/isl/isl_gen6.h diff --git a/src/vulkan/isl_gen7.c b/src/isl/isl_gen7.c similarity index 100% rename from src/vulkan/isl_gen7.c rename to src/isl/isl_gen7.c diff --git a/src/vulkan/isl_gen7.h b/src/isl/isl_gen7.h similarity index 100% rename from src/vulkan/isl_gen7.h rename to src/isl/isl_gen7.h diff --git a/src/vulkan/isl_gen8.c b/src/isl/isl_gen8.c similarity index 100% rename from src/vulkan/isl_gen8.c rename to src/isl/isl_gen8.c diff --git a/src/vulkan/isl_gen8.h b/src/isl/isl_gen8.h similarity index 100% rename from src/vulkan/isl_gen8.h rename to src/isl/isl_gen8.h diff --git a/src/vulkan/isl_gen9.c b/src/isl/isl_gen9.c similarity index 100% rename from src/vulkan/isl_gen9.c rename to src/isl/isl_gen9.c diff --git a/src/vulkan/isl_gen9.h b/src/isl/isl_gen9.h similarity index 100% rename from src/vulkan/isl_gen9.h rename to src/isl/isl_gen9.h diff --git a/src/vulkan/isl_image.c b/src/isl/isl_image.c similarity index 100% rename from src/vulkan/isl_image.c rename to src/isl/isl_image.c diff --git a/src/vulkan/isl_priv.h b/src/isl/isl_priv.h similarity index 100% rename from src/vulkan/isl_priv.h rename to src/isl/isl_priv.h diff --git a/src/vulkan/.gitignore b/src/vulkan/.gitignore index 316d24a9b02..8f9477c4c63 100644 --- a/src/vulkan/.gitignore +++ b/src/vulkan/.gitignore @@ -5,4 +5,3 @@ /wayland-drm-protocol.c /wayland-drm-client-protocol.h /anv_icd.json -/isl_format_layout.c diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index e51f3cf01d7..efb781e8c0b 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -44,7 +44,7 @@ PER_GEN_LIBS = \ libanv-gen8.la \ libanv-gen9.la -noinst_LTLIBRARIES = $(PER_GEN_LIBS) libisl.la +noinst_LTLIBRARIES = $(PER_GEN_LIBS) # The gallium includes are for the util/u_math.h include from main/macros.h @@ -61,6 +61,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/mesa/drivers/dri/i965 \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/isl/ \ -I$(top_builddir)/src \ -I$(top_builddir)/src/glsl/nir \ -I$(top_builddir)/src/vulkan @@ -92,28 +93,9 @@ VULKAN_SOURCES = \ anv_wsi.c \ anv_wsi_x11.c -libisl_la_CFLAGS = $(libvulkan_la_CFLAGS) - -libisl_la_SOURCES = \ - isl.c \ - isl_format_layout.c \ - isl_gen4.c \ - isl_gen4.h \ - isl_gen6.c \ - isl_gen6.h \ - isl_gen7.c \ - isl_gen7.h \ - isl_gen8.c \ - isl_gen8.h \ - isl_gen9.c \ - isl_gen9.h \ - isl_image.c \ - $(NULL) - BUILT_SOURCES = \ anv_entrypoints.h \ - anv_entrypoints.c \ - isl_format_layout.c + anv_entrypoints.c libanv_gen7_la_SOURCES = \ genX_cmd_buffer.c \ @@ -171,19 +153,15 @@ anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS) anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS) $(AM_V_GEN) cat $(vulkan_include_HEADERS) | $(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) - | $(PYTHON2) $< code > $@ -isl_format_layout.c: isl_format_layout_gen.bash \ - isl_format_layout.csv - $(AM_V_GEN)$(srcdir)/isl_format_layout_gen.bash \ - <$(srcdir)/isl_format_layout.csv >$@ - CLEANFILES = $(BUILT_SOURCES) libvulkan_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \ + $(top_builddir)/src/isl/libisl.la \ $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \ ../mesa/libmesa.la \ ../mesa/drivers/dri/common/libdri_test_stubs.la \ -lpthread -ldl -lstdc++ \ - $(PER_GEN_LIBS) libisl.la + $(PER_GEN_LIBS) # Libvulkan with dummy gem. Used for unit tests. -- 2.30.2