Mesa (vulkan): Move isl to src/intel
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Thu Feb 18 18:42:17 UTC 2016
Module: Mesa
Branch: vulkan
Commit: 47b8b08612d44a43e43c3f6e95fe509ee3348723
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=47b8b08612d44a43e43c3f6e95fe509ee3348723
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Thu Feb 18 10:34:47 2016 -0800
Move isl to src/intel
---
configure.ac | 2 +-
src/Makefile.am | 1 -
src/intel/Makefile.am | 2 +-
src/{ => intel}/isl/.gitignore | 0
src/{ => intel}/isl/Makefile.am | 0
src/{ => intel}/isl/README | 0
src/{ => intel}/isl/isl.c | 0
src/{ => intel}/isl/isl.h | 0
src/{ => intel}/isl/isl_format.c | 0
src/{ => intel}/isl/isl_format_layout.csv | 0
src/{ => intel}/isl/isl_format_layout_gen.bash | 0
src/{ => intel}/isl/isl_gen4.c | 0
src/{ => intel}/isl/isl_gen4.h | 0
src/{ => intel}/isl/isl_gen6.c | 0
src/{ => intel}/isl/isl_gen6.h | 0
src/{ => intel}/isl/isl_gen7.c | 0
src/{ => intel}/isl/isl_gen7.h | 0
src/{ => intel}/isl/isl_gen8.c | 0
src/{ => intel}/isl/isl_gen8.h | 0
src/{ => intel}/isl/isl_gen9.c | 0
src/{ => intel}/isl/isl_gen9.h | 0
src/{ => intel}/isl/isl_image.c | 0
src/{ => intel}/isl/isl_priv.h | 0
src/{ => intel}/isl/tests/.gitignore | 0
src/{ => intel}/isl/tests/isl_surf_get_image_offset_test.c | 0
src/vulkan/Makefile.am | 3 +--
src/vulkan/anv_private.h | 2 +-
27 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index d6692b7..604ea37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2520,7 +2520,7 @@ AC_CONFIG_FILES([Makefile
src/gtest/Makefile
src/intel/Makefile
src/intel/genxml/Makefile
- src/isl/Makefile
+ src/intel/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 25b48c6..02b8371 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,7 +58,6 @@ AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
if HAVE_VULKAN
SUBDIRS += intel
-SUBDIRS += isl
SUBDIRS += vulkan
endif
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 0a6f411..520602d 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -19,4 +19,4 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-SUBDIRS = genxml
+SUBDIRS = genxml isl
diff --git a/src/isl/.gitignore b/src/intel/isl/.gitignore
similarity index 100%
rename from src/isl/.gitignore
rename to src/intel/isl/.gitignore
diff --git a/src/isl/Makefile.am b/src/intel/isl/Makefile.am
similarity index 100%
rename from src/isl/Makefile.am
rename to src/intel/isl/Makefile.am
diff --git a/src/isl/README b/src/intel/isl/README
similarity index 100%
rename from src/isl/README
rename to src/intel/isl/README
diff --git a/src/isl/isl.c b/src/intel/isl/isl.c
similarity index 100%
rename from src/isl/isl.c
rename to src/intel/isl/isl.c
diff --git a/src/isl/isl.h b/src/intel/isl/isl.h
similarity index 100%
rename from src/isl/isl.h
rename to src/intel/isl/isl.h
diff --git a/src/isl/isl_format.c b/src/intel/isl/isl_format.c
similarity index 100%
rename from src/isl/isl_format.c
rename to src/intel/isl/isl_format.c
diff --git a/src/isl/isl_format_layout.csv b/src/intel/isl/isl_format_layout.csv
similarity index 100%
rename from src/isl/isl_format_layout.csv
rename to src/intel/isl/isl_format_layout.csv
diff --git a/src/isl/isl_format_layout_gen.bash b/src/intel/isl/isl_format_layout_gen.bash
similarity index 100%
rename from src/isl/isl_format_layout_gen.bash
rename to src/intel/isl/isl_format_layout_gen.bash
diff --git a/src/isl/isl_gen4.c b/src/intel/isl/isl_gen4.c
similarity index 100%
rename from src/isl/isl_gen4.c
rename to src/intel/isl/isl_gen4.c
diff --git a/src/isl/isl_gen4.h b/src/intel/isl/isl_gen4.h
similarity index 100%
rename from src/isl/isl_gen4.h
rename to src/intel/isl/isl_gen4.h
diff --git a/src/isl/isl_gen6.c b/src/intel/isl/isl_gen6.c
similarity index 100%
rename from src/isl/isl_gen6.c
rename to src/intel/isl/isl_gen6.c
diff --git a/src/isl/isl_gen6.h b/src/intel/isl/isl_gen6.h
similarity index 100%
rename from src/isl/isl_gen6.h
rename to src/intel/isl/isl_gen6.h
diff --git a/src/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c
similarity index 100%
rename from src/isl/isl_gen7.c
rename to src/intel/isl/isl_gen7.c
diff --git a/src/isl/isl_gen7.h b/src/intel/isl/isl_gen7.h
similarity index 100%
rename from src/isl/isl_gen7.h
rename to src/intel/isl/isl_gen7.h
diff --git a/src/isl/isl_gen8.c b/src/intel/isl/isl_gen8.c
similarity index 100%
rename from src/isl/isl_gen8.c
rename to src/intel/isl/isl_gen8.c
diff --git a/src/isl/isl_gen8.h b/src/intel/isl/isl_gen8.h
similarity index 100%
rename from src/isl/isl_gen8.h
rename to src/intel/isl/isl_gen8.h
diff --git a/src/isl/isl_gen9.c b/src/intel/isl/isl_gen9.c
similarity index 100%
rename from src/isl/isl_gen9.c
rename to src/intel/isl/isl_gen9.c
diff --git a/src/isl/isl_gen9.h b/src/intel/isl/isl_gen9.h
similarity index 100%
rename from src/isl/isl_gen9.h
rename to src/intel/isl/isl_gen9.h
diff --git a/src/isl/isl_image.c b/src/intel/isl/isl_image.c
similarity index 100%
rename from src/isl/isl_image.c
rename to src/intel/isl/isl_image.c
diff --git a/src/isl/isl_priv.h b/src/intel/isl/isl_priv.h
similarity index 100%
rename from src/isl/isl_priv.h
rename to src/intel/isl/isl_priv.h
diff --git a/src/isl/tests/.gitignore b/src/intel/isl/tests/.gitignore
similarity index 100%
rename from src/isl/tests/.gitignore
rename to src/intel/isl/tests/.gitignore
diff --git a/src/isl/tests/isl_surf_get_image_offset_test.c b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
similarity index 100%
rename from src/isl/tests/isl_surf_get_image_offset_test.c
rename to src/intel/isl/tests/isl_surf_get_image_offset_test.c
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index 50d972e..0605dc4 100644
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -62,7 +62,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/intel/ \
- -I$(top_srcdir)/src/isl/ \
-I$(top_builddir)/src \
-I$(top_builddir)/src/compiler \
-I$(top_builddir)/src/compiler/nir \
@@ -165,7 +164,7 @@ anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
CLEANFILES = $(BUILT_SOURCES)
libvulkan_intel_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \
- $(top_builddir)/src/isl/libisl.la \
+ $(top_builddir)/src/intel/isl/libisl.la \
$(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
../mesa/libmesa.la \
../mesa/drivers/dri/common/libdri_test_stubs.la \
diff --git a/src/vulkan/anv_private.h b/src/vulkan/anv_private.h
index 06b9614..ba86333 100644
--- a/src/vulkan/anv_private.h
+++ b/src/vulkan/anv_private.h
@@ -62,7 +62,7 @@ typedef uint32_t xcb_window_t;
#include "anv_entrypoints.h"
#include "anv_gen_macros.h"
#include "brw_context.h"
-#include "isl.h"
+#include "isl/isl.h"
#ifdef __cplusplus
extern "C" {
More information about the mesa-commit
mailing list