From 2c616080220bf33a8348e12fd8a5c87052300a54 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 22 Dec 2012 03:12:58 +0200 Subject: [PATCH] bump libpicofe for r-pi gl code --- Makefile | 3 ++- configure | 3 +++ frontend/libpicofe | 2 +- frontend/plat_sdl.c | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a3cd3b20..0d72dea0 100644 --- a/Makefile +++ b/Makefile @@ -138,9 +138,10 @@ OBJS += frontend/libpicofe/plat_dummy.o OBJS += frontend/libpicofe/linux/in_evdev.o OBJS += frontend/plat_sdl.o ifeq "$(HAVE_GLES)" "1" -OBJS += frontend/libpicofe/gl.o +OBJS += frontend/libpicofe/gl.o frontend/libpicofe/gl_platform.o LDLIBS += $(LDLIBS_GLES) frontend/libpicofe/plat_sdl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +frontend/libpicofe/gl_platform.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) frontend/libpicofe/gl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) frontend/plat_sdl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) endif diff --git a/configure b/configure index 8ef76113..f55e9b65 100755 --- a/configure +++ b/configure @@ -425,6 +425,9 @@ echo "enable dynarec $enable_dynarec" echo "ARMv7 optimizations $have_armv7" echo "enable ARM NEON $have_arm_neon" echo "tslib support $have_tslib" +if [ "$platform" = "generic" ]; then + echo "OpenGL ES output $have_gles" +fi echo "# Automatically generated by configure" > $config_mak printf "# Configured with:" >> $config_mak diff --git a/frontend/libpicofe b/frontend/libpicofe index e81b987f..0d645bc5 160000 --- a/frontend/libpicofe +++ b/frontend/libpicofe @@ -1 +1 @@ -Subproject commit e81b987fc1e567f92298087e32e5d9f01fce0aa7 +Subproject commit 0d645bc539fdc073f20c4dea9f4a4e218cebec0e diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c index ec2d9c24..5b853752 100644 --- a/frontend/plat_sdl.c +++ b/frontend/plat_sdl.c @@ -69,7 +69,7 @@ static int change_video_mode(void) h = psx_h; } - return plat_sdl_change_video_mode(w, h); + return plat_sdl_change_video_mode(w, h, 0); } void plat_init(void) -- 2.39.5