Move isl to src/intel

2016-02-18 10:34:47 -08:00 · 2016-02-18 10:34:47 -08:00 · 47b8b08612
parent f6d9587688
commit 47b8b08612
27 changed files with 4 additions and 6 deletions
--- 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
--- 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

--- 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
--- a/src/intel/isl/.gitignore
+++ b/src/intel/isl/.gitignore
--- a/src/intel/isl/Makefile.am
+++ b/src/intel/isl/Makefile.am
--- a/src/intel/isl/README
+++ b/src/intel/isl/README
--- a/src/intel/isl/isl.c
+++ b/src/intel/isl/isl.c
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
--- a/src/intel/isl/isl_format_layout.csv
+++ b/src/intel/isl/isl_format_layout.csv
--- a/src/intel/isl/isl_format_layout_gen.bash
+++ b/src/intel/isl/isl_format_layout_gen.bash
--- a/src/intel/isl/isl_gen4.c
+++ b/src/intel/isl/isl_gen4.c
--- a/src/intel/isl/isl_gen4.h
+++ b/src/intel/isl/isl_gen4.h
--- a/src/intel/isl/isl_gen6.c
+++ b/src/intel/isl/isl_gen6.c
--- a/src/intel/isl/isl_gen6.h
+++ b/src/intel/isl/isl_gen6.h
--- a/src/intel/isl/isl_gen7.c
+++ b/src/intel/isl/isl_gen7.c
--- a/src/intel/isl/isl_gen7.h
+++ b/src/intel/isl/isl_gen7.h
--- a/src/intel/isl/isl_gen8.c
+++ b/src/intel/isl/isl_gen8.c
--- a/src/intel/isl/isl_gen8.h
+++ b/src/intel/isl/isl_gen8.h
--- a/src/intel/isl/isl_gen9.c
+++ b/src/intel/isl/isl_gen9.c
--- a/src/intel/isl/isl_gen9.h
+++ b/src/intel/isl/isl_gen9.h
--- a/src/intel/isl/isl_image.c
+++ b/src/intel/isl/isl_image.c
--- a/src/intel/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
--- a/src/intel/isl/tests/.gitignore
+++ b/src/intel/isl/tests/.gitignore
--- a/src/intel/isl/tests/isl_surf_get_image_offset_test.c
+++ b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
--- 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 \
--- 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" {