diff --git a/Makefile.common b/Makefile.common index bd82ed4b89..3862c71af7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -2095,7 +2095,7 @@ ifeq ($(HAVE_MATH_NEON), 1) endif ifeq ($(HAVE_VITAGL), 1) - DEFINES += -DHAVE_VITAGL -DTRANSPOSE_MATRICES + DEFINES += -DHAVE_VITAGL -DSTB_DXT_IMPLEMENTATION -DSKIP_ERROR_HANDLING INCLUDE_DIRS += -I$(DEPS_DIR)/vitaGL/source SOURCES := $(DEPS_DIR)/vitaGL/source $(DEPS_DIR)/vitaGL/source/utils OBJ += $(patsubst %.c,%.o,$(foreach dir,$(SOURCES), $(wildcard $(dir)/*.c))) diff --git a/Makefile.vita b/Makefile.vita index 08508371a0..fbb85cd20c 100644 --- a/Makefile.vita +++ b/Makefile.vita @@ -1,5 +1,6 @@ TARGET := retroarch_vita DEBUG ?= 0 +HAVE_FILE_LOGGER = 1 GRIFFIN_BUILD = 0 WHOLE_ARCHIVE_LINK = 0 @@ -181,6 +182,10 @@ vpksend: $(TARGET).vpk send: $(TARGET).self curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin +launch: $(TARGET).self + curl -T $< ftp://$(PSVITAIP):1337/ux0:/app/$(VITA_TITLE_ID)/eboot.bin + echo "launch $(VITA_TITLE_ID)" | nc ${PSVITAIP} 1338 + .PHONY: clean all send vpksend .PRECIOUS: %.depend diff --git a/gfx/drivers_display/gfx_display_gl1.c b/gfx/drivers_display/gfx_display_gl1.c index 366d8150de..2189a66649 100644 --- a/gfx/drivers_display/gfx_display_gl1.c +++ b/gfx/drivers_display/gfx_display_gl1.c @@ -112,6 +112,8 @@ static void gfx_display_gl1_draw(gfx_display_ctx_draw_t *draw, draw->coords->tex_coord = gfx_display_gl1_get_default_tex_coords(); if (!draw->coords->lut_tex_coord) draw->coords->lut_tex_coord = gfx_display_gl1_get_default_tex_coords(); + if (!draw->texture) + return; gfx_display_gl1_viewport(draw, gl1); @@ -146,7 +148,6 @@ static void gfx_display_gl1_draw(gfx_display_ctx_draw_t *draw, for (i = 0; i < draw->coords->vertices; i++) { memcpy(&vertices3[i*3], &draw->coords->vertex[i*2], sizeof(float) * 2); - vertices3[i*3] -= 0.5f; vertices3[i*3+2] = 0.0f; } glVertexPointer(3, GL_FLOAT, 0, vertices3); diff --git a/gfx/drivers_font/gl1_raster_font.c b/gfx/drivers_font/gl1_raster_font.c index 5b62eee9bd..118d42e903 100644 --- a/gfx/drivers_font/gl1_raster_font.c +++ b/gfx/drivers_font/gl1_raster_font.c @@ -273,7 +273,6 @@ static void gl1_raster_font_draw_vertices(gl1_raster_t *font, int i; for (i = 0; i < coords->vertices; i++) { memcpy(&vertices3[i*3], &coords->vertex[i*2], sizeof(float) * 2); - vertices3[i*3] -= 0.5f; vertices3[i*3+2] = 0.0f; } glVertexPointer(3, GL_FLOAT, 0, vertices3);