summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/isl/.gitignore1
-rw-r--r--src/isl/Makefile.am67
-rw-r--r--src/isl/isl.c (renamed from src/vulkan/isl.c)0
-rw-r--r--src/isl/isl.h (renamed from src/vulkan/isl.h)0
-rw-r--r--src/isl/isl_format_layout.csv (renamed from src/vulkan/isl_format_layout.csv)0
-rwxr-xr-xsrc/isl/isl_format_layout_gen.bash (renamed from src/vulkan/isl_format_layout_gen.bash)0
-rw-r--r--src/isl/isl_gen4.c (renamed from src/vulkan/isl_gen4.c)0
-rw-r--r--src/isl/isl_gen4.h (renamed from src/vulkan/isl_gen4.h)0
-rw-r--r--src/isl/isl_gen6.c (renamed from src/vulkan/isl_gen6.c)0
-rw-r--r--src/isl/isl_gen6.h (renamed from src/vulkan/isl_gen6.h)0
-rw-r--r--src/isl/isl_gen7.c (renamed from src/vulkan/isl_gen7.c)0
-rw-r--r--src/isl/isl_gen7.h (renamed from src/vulkan/isl_gen7.h)0
-rw-r--r--src/isl/isl_gen8.c (renamed from src/vulkan/isl_gen8.c)0
-rw-r--r--src/isl/isl_gen8.h (renamed from src/vulkan/isl_gen8.h)0
-rw-r--r--src/isl/isl_gen9.c (renamed from src/vulkan/isl_gen9.c)0
-rw-r--r--src/isl/isl_gen9.h (renamed from src/vulkan/isl_gen9.h)0
-rw-r--r--src/isl/isl_image.c (renamed from src/vulkan/isl_image.c)0
-rw-r--r--src/isl/isl_priv.h (renamed from src/vulkan/isl_priv.h)0
-rw-r--r--src/vulkan/.gitignore1
-rw-r--r--src/vulkan/Makefile.am32
22 files changed, 75 insertions, 28 deletions
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
index d858ea74745..d858ea74745 100644
--- a/src/vulkan/isl.c
+++ b/src/isl/isl.c
diff --git a/src/vulkan/isl.h b/src/isl/isl.h
index 184b0c5f70a..184b0c5f70a 100644
--- a/src/vulkan/isl.h
+++ b/src/isl/isl.h
diff --git a/src/vulkan/isl_format_layout.csv b/src/isl/isl_format_layout.csv
index 2a302b002ef..2a302b002ef 100644
--- a/src/vulkan/isl_format_layout.csv
+++ b/src/isl/isl_format_layout.csv
diff --git a/src/vulkan/isl_format_layout_gen.bash b/src/isl/isl_format_layout_gen.bash
index 2511f299a7e..2511f299a7e 100755
--- a/src/vulkan/isl_format_layout_gen.bash
+++ b/src/isl/isl_format_layout_gen.bash
diff --git a/src/vulkan/isl_gen4.c b/src/isl/isl_gen4.c
index 52aa5655bb2..52aa5655bb2 100644
--- a/src/vulkan/isl_gen4.c
+++ b/src/isl/isl_gen4.c
diff --git a/src/vulkan/isl_gen4.h b/src/isl/isl_gen4.h
index 06cd70b9206..06cd70b9206 100644
--- a/src/vulkan/isl_gen4.h
+++ b/src/isl/isl_gen4.h
diff --git a/src/vulkan/isl_gen6.c b/src/isl/isl_gen6.c
index 24c393925ed..24c393925ed 100644
--- a/src/vulkan/isl_gen6.c
+++ b/src/isl/isl_gen6.c
diff --git a/src/vulkan/isl_gen6.h b/src/isl/isl_gen6.h
index 0779c674940..0779c674940 100644
--- a/src/vulkan/isl_gen6.h
+++ b/src/isl/isl_gen6.h
diff --git a/src/vulkan/isl_gen7.c b/src/isl/isl_gen7.c
index 9984f61b2a4..9984f61b2a4 100644
--- a/src/vulkan/isl_gen7.c
+++ b/src/isl/isl_gen7.c
diff --git a/src/vulkan/isl_gen7.h b/src/isl/isl_gen7.h
index 2a95b68a9bd..2a95b68a9bd 100644
--- a/src/vulkan/isl_gen7.h
+++ b/src/isl/isl_gen7.h
diff --git a/src/vulkan/isl_gen8.c b/src/isl/isl_gen8.c
index 2f434aabb2e..2f434aabb2e 100644
--- a/src/vulkan/isl_gen8.c
+++ b/src/isl/isl_gen8.c
diff --git a/src/vulkan/isl_gen8.h b/src/isl/isl_gen8.h
index 2017ea8ddc1..2017ea8ddc1 100644
--- a/src/vulkan/isl_gen8.h
+++ b/src/isl/isl_gen8.h
diff --git a/src/vulkan/isl_gen9.c b/src/isl/isl_gen9.c
index aa290aa1c35..aa290aa1c35 100644
--- a/src/vulkan/isl_gen9.c
+++ b/src/isl/isl_gen9.c
diff --git a/src/vulkan/isl_gen9.h b/src/isl/isl_gen9.h
index 64ed0aa44ef..64ed0aa44ef 100644
--- a/src/vulkan/isl_gen9.h
+++ b/src/isl/isl_gen9.h
diff --git a/src/vulkan/isl_image.c b/src/isl/isl_image.c
index 2d146d59ac5..2d146d59ac5 100644
--- a/src/vulkan/isl_image.c
+++ b/src/isl/isl_image.c
diff --git a/src/vulkan/isl_priv.h b/src/isl/isl_priv.h
index 1c9343a7d1f..1c9343a7d1f 100644
--- a/src/vulkan/isl_priv.h
+++ b/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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 16:11:08 +0000