From 6a5fee664f40585d8bb63ca03c61528cd00e81fc Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 1 Aug 2016 00:50:13 +0200 Subject: [PATCH] (Vita) Start baking in libvita2d --- Makefile.griffin | 16 ++++++++++------ deps/libvita2d/{libvita2d => }/Makefile | 0 .../{libvita2d => }/include/bin_packing_2d.h | 0 .../{libvita2d => }/include/int_htab.h | 0 deps/libvita2d/{libvita2d => }/include/shared.h | 0 .../{libvita2d => }/include/texture_atlas.h | 0 deps/libvita2d/{libvita2d => }/include/utils.h | 0 deps/libvita2d/{libvita2d => }/include/vita2d.h | 0 deps/libvita2d/libvita2d/source/.vita2d.c.swp | Bin 16384 -> 0 bytes .../libvita2d/{libvita2d => }/shader/clear_f.cg | 0 .../libvita2d/{libvita2d => }/shader/clear_v.cg | 0 .../libvita2d/{libvita2d => }/shader/color_f.cg | 0 .../libvita2d/{libvita2d => }/shader/color_v.cg | 0 .../{libvita2d => }/shader/texture_f.cg | 0 .../{libvita2d => }/shader/texture_tint_f.cg | 0 .../{libvita2d => }/shader/texture_v.cg | 0 .../{libvita2d => }/source/bin_packing_2d.c | 0 .../libvita2d/{libvita2d => }/source/int_htab.c | 0 .../{libvita2d => }/source/texture_atlas.c | 0 deps/libvita2d/{libvita2d => }/source/utils.c | 0 deps/libvita2d/{libvita2d => }/source/vita2d.c | 0 .../{libvita2d => }/source/vita2d_draw.c | 0 .../{libvita2d => }/source/vita2d_font.c | 0 .../{libvita2d => }/source/vita2d_image_bmp.c | 0 .../{libvita2d => }/source/vita2d_image_jpeg.c | 0 .../{libvita2d => }/source/vita2d_image_png.c | 0 .../{libvita2d => }/source/vita2d_pgf.c | 0 .../{libvita2d => }/source/vita2d_texture.c | 0 griffin/griffin.c | 13 +++++++++++++ 29 files changed, 23 insertions(+), 6 deletions(-) rename deps/libvita2d/{libvita2d => }/Makefile (100%) rename deps/libvita2d/{libvita2d => }/include/bin_packing_2d.h (100%) rename deps/libvita2d/{libvita2d => }/include/int_htab.h (100%) rename deps/libvita2d/{libvita2d => }/include/shared.h (100%) rename deps/libvita2d/{libvita2d => }/include/texture_atlas.h (100%) rename deps/libvita2d/{libvita2d => }/include/utils.h (100%) rename deps/libvita2d/{libvita2d => }/include/vita2d.h (100%) delete mode 100644 deps/libvita2d/libvita2d/source/.vita2d.c.swp rename deps/libvita2d/{libvita2d => }/shader/clear_f.cg (100%) rename deps/libvita2d/{libvita2d => }/shader/clear_v.cg (100%) rename deps/libvita2d/{libvita2d => }/shader/color_f.cg (100%) rename deps/libvita2d/{libvita2d => }/shader/color_v.cg (100%) rename deps/libvita2d/{libvita2d => }/shader/texture_f.cg (100%) rename deps/libvita2d/{libvita2d => }/shader/texture_tint_f.cg (100%) rename deps/libvita2d/{libvita2d => }/shader/texture_v.cg (100%) rename deps/libvita2d/{libvita2d => }/source/bin_packing_2d.c (100%) rename deps/libvita2d/{libvita2d => }/source/int_htab.c (100%) rename deps/libvita2d/{libvita2d => }/source/texture_atlas.c (100%) rename deps/libvita2d/{libvita2d => }/source/utils.c (100%) rename deps/libvita2d/{libvita2d => }/source/vita2d.c (100%) rename deps/libvita2d/{libvita2d => }/source/vita2d_draw.c (100%) rename deps/libvita2d/{libvita2d => }/source/vita2d_font.c (100%) rename deps/libvita2d/{libvita2d => }/source/vita2d_image_bmp.c (100%) rename deps/libvita2d/{libvita2d => }/source/vita2d_image_jpeg.c (100%) rename deps/libvita2d/{libvita2d => }/source/vita2d_image_png.c (100%) rename deps/libvita2d/{libvita2d => }/source/vita2d_pgf.c (100%) rename deps/libvita2d/{libvita2d => }/source/vita2d_texture.c (100%) diff --git a/Makefile.griffin b/Makefile.griffin index 5a513f5968..02d2ef3663 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -208,12 +208,20 @@ else ifeq ($(platform), vita) EXT_TARGET := $(TARGET_NAME)_$(platform).velf EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf MACHDEP := -DVITA + INCLUDE += -I$(VITASDK)/arm-vita-eabi/include/freetype2 -Ideps/libvita2d/include PLATCFLAGS := -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\ -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \ -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lfreetype -lz -lm -lc -lpng - PLATOBJS += libretro-common/conversion/s16_to_float_neon.o \ + PLATOBJS += deps/libvita2d/shader/compiled/clear_v_gxp.o \ + deps/libvita2d/shader/compiled/clear_f_gxp.o \ + deps/libvita2d/shader/compiled/color_v_gxp.o \ + deps/libvita2d/shader/compiled/color_f_gxp.o \ + deps/libvita2d/shader/compiled/texture_v_gxp.o \ + deps/libvita2d/shader/compiled/texture_f_gxp.o \ + deps/libvita2d/shader/compiled/texture_tint_f_gxp.o\ + libretro-common/conversion/s16_to_float_neon.o \ audio/drivers_resampler/sinc_resampler_neon.o \ audio/drivers_resampler/cc_resampler_neon.o @@ -266,7 +274,7 @@ CFLAGS += -DHAVE_WIIUSB_HID -DHAVE_HID endif ifeq ($(HAVE_VITA2D), 1) -CFLAGS += -DHAVE_VITA2D +CFLAGS += -DHAVE_VITA2D - endif ifeq ($(HAVE_LIBRETRODB), 1) @@ -354,10 +362,6 @@ LIBS += -lpthread-psp endif endif -ifeq ($(HAVE_VITA2D), 1) -LIBS := -lvita2d $(LIBS) -endif - ifeq ($(HAVE_RSOUND), 1) CFLAGS += -DHAVE_RSOUND endif diff --git a/deps/libvita2d/libvita2d/Makefile b/deps/libvita2d/Makefile similarity index 100% rename from deps/libvita2d/libvita2d/Makefile rename to deps/libvita2d/Makefile diff --git a/deps/libvita2d/libvita2d/include/bin_packing_2d.h b/deps/libvita2d/include/bin_packing_2d.h similarity index 100% rename from deps/libvita2d/libvita2d/include/bin_packing_2d.h rename to deps/libvita2d/include/bin_packing_2d.h diff --git a/deps/libvita2d/libvita2d/include/int_htab.h b/deps/libvita2d/include/int_htab.h similarity index 100% rename from deps/libvita2d/libvita2d/include/int_htab.h rename to deps/libvita2d/include/int_htab.h diff --git a/deps/libvita2d/libvita2d/include/shared.h b/deps/libvita2d/include/shared.h similarity index 100% rename from deps/libvita2d/libvita2d/include/shared.h rename to deps/libvita2d/include/shared.h diff --git a/deps/libvita2d/libvita2d/include/texture_atlas.h b/deps/libvita2d/include/texture_atlas.h similarity index 100% rename from deps/libvita2d/libvita2d/include/texture_atlas.h rename to deps/libvita2d/include/texture_atlas.h diff --git a/deps/libvita2d/libvita2d/include/utils.h b/deps/libvita2d/include/utils.h similarity index 100% rename from deps/libvita2d/libvita2d/include/utils.h rename to deps/libvita2d/include/utils.h diff --git a/deps/libvita2d/libvita2d/include/vita2d.h b/deps/libvita2d/include/vita2d.h similarity index 100% rename from deps/libvita2d/libvita2d/include/vita2d.h rename to deps/libvita2d/include/vita2d.h diff --git a/deps/libvita2d/libvita2d/source/.vita2d.c.swp b/deps/libvita2d/libvita2d/source/.vita2d.c.swp deleted file mode 100644 index 97d6f9aa73d561f959da03738b9c58a0bb5c1dfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 diff --git a/deps/libvita2d/libvita2d/shader/clear_f.cg b/deps/libvita2d/shader/clear_f.cg similarity index 100% rename from deps/libvita2d/libvita2d/shader/clear_f.cg rename to deps/libvita2d/shader/clear_f.cg diff --git a/deps/libvita2d/libvita2d/shader/clear_v.cg b/deps/libvita2d/shader/clear_v.cg similarity index 100% rename from deps/libvita2d/libvita2d/shader/clear_v.cg rename to deps/libvita2d/shader/clear_v.cg diff --git a/deps/libvita2d/libvita2d/shader/color_f.cg b/deps/libvita2d/shader/color_f.cg similarity index 100% rename from deps/libvita2d/libvita2d/shader/color_f.cg rename to deps/libvita2d/shader/color_f.cg diff --git a/deps/libvita2d/libvita2d/shader/color_v.cg b/deps/libvita2d/shader/color_v.cg similarity index 100% rename from deps/libvita2d/libvita2d/shader/color_v.cg rename to deps/libvita2d/shader/color_v.cg diff --git a/deps/libvita2d/libvita2d/shader/texture_f.cg b/deps/libvita2d/shader/texture_f.cg similarity index 100% rename from deps/libvita2d/libvita2d/shader/texture_f.cg rename to deps/libvita2d/shader/texture_f.cg diff --git a/deps/libvita2d/libvita2d/shader/texture_tint_f.cg b/deps/libvita2d/shader/texture_tint_f.cg similarity index 100% rename from deps/libvita2d/libvita2d/shader/texture_tint_f.cg rename to deps/libvita2d/shader/texture_tint_f.cg diff --git a/deps/libvita2d/libvita2d/shader/texture_v.cg b/deps/libvita2d/shader/texture_v.cg similarity index 100% rename from deps/libvita2d/libvita2d/shader/texture_v.cg rename to deps/libvita2d/shader/texture_v.cg diff --git a/deps/libvita2d/libvita2d/source/bin_packing_2d.c b/deps/libvita2d/source/bin_packing_2d.c similarity index 100% rename from deps/libvita2d/libvita2d/source/bin_packing_2d.c rename to deps/libvita2d/source/bin_packing_2d.c diff --git a/deps/libvita2d/libvita2d/source/int_htab.c b/deps/libvita2d/source/int_htab.c similarity index 100% rename from deps/libvita2d/libvita2d/source/int_htab.c rename to deps/libvita2d/source/int_htab.c diff --git a/deps/libvita2d/libvita2d/source/texture_atlas.c b/deps/libvita2d/source/texture_atlas.c similarity index 100% rename from deps/libvita2d/libvita2d/source/texture_atlas.c rename to deps/libvita2d/source/texture_atlas.c diff --git a/deps/libvita2d/libvita2d/source/utils.c b/deps/libvita2d/source/utils.c similarity index 100% rename from deps/libvita2d/libvita2d/source/utils.c rename to deps/libvita2d/source/utils.c diff --git a/deps/libvita2d/libvita2d/source/vita2d.c b/deps/libvita2d/source/vita2d.c similarity index 100% rename from deps/libvita2d/libvita2d/source/vita2d.c rename to deps/libvita2d/source/vita2d.c diff --git a/deps/libvita2d/libvita2d/source/vita2d_draw.c b/deps/libvita2d/source/vita2d_draw.c similarity index 100% rename from deps/libvita2d/libvita2d/source/vita2d_draw.c rename to deps/libvita2d/source/vita2d_draw.c diff --git a/deps/libvita2d/libvita2d/source/vita2d_font.c b/deps/libvita2d/source/vita2d_font.c similarity index 100% rename from deps/libvita2d/libvita2d/source/vita2d_font.c rename to deps/libvita2d/source/vita2d_font.c diff --git a/deps/libvita2d/libvita2d/source/vita2d_image_bmp.c b/deps/libvita2d/source/vita2d_image_bmp.c similarity index 100% rename from deps/libvita2d/libvita2d/source/vita2d_image_bmp.c rename to deps/libvita2d/source/vita2d_image_bmp.c diff --git a/deps/libvita2d/libvita2d/source/vita2d_image_jpeg.c b/deps/libvita2d/source/vita2d_image_jpeg.c similarity index 100% rename from deps/libvita2d/libvita2d/source/vita2d_image_jpeg.c rename to deps/libvita2d/source/vita2d_image_jpeg.c diff --git a/deps/libvita2d/libvita2d/source/vita2d_image_png.c b/deps/libvita2d/source/vita2d_image_png.c similarity index 100% rename from deps/libvita2d/libvita2d/source/vita2d_image_png.c rename to deps/libvita2d/source/vita2d_image_png.c diff --git a/deps/libvita2d/libvita2d/source/vita2d_pgf.c b/deps/libvita2d/source/vita2d_pgf.c similarity index 100% rename from deps/libvita2d/libvita2d/source/vita2d_pgf.c rename to deps/libvita2d/source/vita2d_pgf.c diff --git a/deps/libvita2d/libvita2d/source/vita2d_texture.c b/deps/libvita2d/source/vita2d_texture.c similarity index 100% rename from deps/libvita2d/libvita2d/source/vita2d_texture.c rename to deps/libvita2d/source/vita2d_texture.c diff --git a/griffin/griffin.c b/griffin/griffin.c index 84d073f256..d5767b725b 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -314,6 +314,19 @@ VIDEO DRIVER #elif defined(PSP) #include "../gfx/drivers/psp1_gfx.c" #elif defined(HAVE_VITA2D) +#include "../deps/libvita2d/source/vita2d.c" +#include "../deps/libvita2d/source/vita2d_texture.c" +#include "../deps/libvita2d/source/vita2d_draw.c" +#include "../deps/libvita2d/source/utils.c" +#include "../deps/libvita2d/source/vita2d_image_png.c" +#include "../deps/libvita2d/source/vita2d_image_jpeg.c" +#include "../deps/libvita2d/source/vita2d_image_bmp.c" +#include "../deps/libvita2d/source/vita2d_font.c" +#include "../deps/libvita2d/source/vita2d_pgf.c" +#include "../deps/libvita2d/source/bin_packing_2d.c" +#include "../deps/libvita2d/source/texture_atlas.c" +#include "../deps/libvita2d/source/int_htab.c" + #include "../gfx/drivers/vita2d_gfx.c" #elif defined(_3DS) #include "../gfx/drivers/ctr_gfx.c"