From 0454ed7808119ce17da50890067cf74beccebca5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 20 Jul 2014 05:33:53 +0200 Subject: [PATCH] Move memcpy implementations into separate dir --- Makefile | 2 +- griffin/griffin.c | 2 +- {ps3 => mem/altivec}/altivec_mem.c | 0 {ps3 => mem/altivec}/altivec_mem.h | 0 {gfx => mem/neon}/memcpy-neon.S | 0 ps3/gcmgl/src/rgl_ps3.cpp | 2 +- ps3/gcmgl/src/rgl_ps3_raster.cpp | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename {ps3 => mem/altivec}/altivec_mem.c (100%) rename {ps3 => mem/altivec}/altivec_mem.h (100%) rename {gfx => mem/neon}/memcpy-neon.S (100%) diff --git a/Makefile b/Makefile index 8175701c2f..4808cc53c2 100644 --- a/Makefile +++ b/Makefile @@ -216,7 +216,7 @@ ifeq ($(HAVE_OMAP), 1) endif ifeq ($(HAVE_EXYNOS), 1) - OBJ += gfx/exynos_gfx.o gfx/memcpy-neon.o + OBJ += gfx/exynos_gfx.o mem/neon/memcpy-neon.o LIBS += $(DRM_LIBS) $(EXYNOS_LIBS) DEFINES += $(DRM_CFLAGS) $(EXYNOS_CFLAGS) endif diff --git a/griffin/griffin.c b/griffin/griffin.c index 8d791dc530..7d9b068cdd 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -28,7 +28,7 @@ #endif #ifdef __CELLOS_LV2__ -#include "../ps3/altivec_mem.c" +#include "../mem/altivec/altivec_mem.c" #endif diff --git a/ps3/altivec_mem.c b/mem/altivec/altivec_mem.c similarity index 100% rename from ps3/altivec_mem.c rename to mem/altivec/altivec_mem.c diff --git a/ps3/altivec_mem.h b/mem/altivec/altivec_mem.h similarity index 100% rename from ps3/altivec_mem.h rename to mem/altivec/altivec_mem.h diff --git a/gfx/memcpy-neon.S b/mem/neon/memcpy-neon.S similarity index 100% rename from gfx/memcpy-neon.S rename to mem/neon/memcpy-neon.S diff --git a/ps3/gcmgl/src/rgl_ps3.cpp b/ps3/gcmgl/src/rgl_ps3.cpp index df3ba34bb7..fff89b2b3a 100644 --- a/ps3/gcmgl/src/rgl_ps3.cpp +++ b/ps3/gcmgl/src/rgl_ps3.cpp @@ -4,7 +4,7 @@ #include -#include "../../altivec_mem.h" +#include "../../mem/altivec/altivec_mem.h" #include "include/GmmAlloc.h" #include "include/rgl-typedefs.h" diff --git a/ps3/gcmgl/src/rgl_ps3_raster.cpp b/ps3/gcmgl/src/rgl_ps3_raster.cpp index f207dee489..d650f4d2bf 100644 --- a/ps3/gcmgl/src/rgl_ps3_raster.cpp +++ b/ps3/gcmgl/src/rgl_ps3_raster.cpp @@ -2,7 +2,7 @@ #include -#include "../../altivec_mem.h" +#include "../../mem/altivec/altivec_mem.h" #include "include/GmmAlloc.h" #include "include/rgl-typedefs.h"