frontend: update libpicofe

diff --git a/Makefile b/Makefile
index 784ef19..1a9576a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -373,7 +373,8 @@ OBJS += frontend/libpicofe/linux/in_evdev.o
 endif
 ifeq "$(HAVE_GLES)" "1"
 OBJS += frontend/libpicofe/gl.o frontend/libpicofe/gl_platform.o
-LDLIBS += $(LDLIBS_GLES)
+OBJS += frontend/libpicofe/gl_loader.o
+#LDLIBS += $(LDLIBS_GLES) # loaded dynamically now
 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)

diff --git a/configure b/configure
index 40827bd..64bb76a 100755 (executable)
--- a/configure
+++ b/configure
@@ -533,6 +533,8 @@ if compile_binary $CFLAGS_GLES -lEGL -lGLES_CM $LDLIBS_GLES; then
 elif compile_binary $CFLAGS_GLES -lEGL -lGLESv1_CM $LDLIBS_GLES; then
   have_gles="yes"
   LDLIBS_GLES="-lEGL -lGLESv1_CM $LDLIBS_GLES"
+elif compile_object $CFLAGS_GLES; then
+  have_gles="yes"
 fi
 
 if check_c64_tools; then
@@ -549,7 +551,7 @@ if [ "$have_dynamic" = "yes" ]; then
   if [ "$builtin_gpu" != "unai" ]; then
     plugins="$plugins plugins/gpu_unai/gpu_unai.so"
   fi
-  if [ "$have_gles" = "yes" ]; then
+  if [ "$have_gles" = "yes" -a "x$LDLIBS_GLES" != "x" ]; then
     plugins="$plugins plugins/gpu-gles/gpu_gles.so"
   fi
   if [ "$have_neon_gpu" = "yes" -a "$builtin_gpu" != "neon" ]; then

diff --git a/frontend/libpicofe b/frontend/libpicofe
index ee0dca9..50d625e 160000 (submodule)
--- a/frontend/libpicofe
+++ b/frontend/libpicofe
@@ -1 +1 @@
-Subproject commit ee0dca9e10ef44d7900c1158cd8025eb86064aeb
+Subproject commit 50d625e820f5db49f97124dd3fe2291f31044227

diff --git a/frontend/menu.c b/frontend/menu.c
index 6144b2c..b50f05a 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1404,8 +1404,8 @@ static menu_entry e_menu_gfx_options[] =
        mee_enum      ("Video output mode",        MA_OPT_VOUT_MODE, plat_target.vout_method, men_dummy),
        mee_onoff     ("Fullscreen mode",          MA_OPT_VOUT_FULL, plat_target.vout_fullscreen, 1),
        mee_onoff     ("Software Scaling",         MA_OPT_SCALER2, soft_scaling, 1),
-       mee_enum      ("Hardware Filter",          MA_OPT_HWFILTER, plat_target.hwfilter, men_dummy),
        mee_enum_h    ("Software Filter",          MA_OPT_SWFILTER, soft_filter, men_soft_filter, h_soft_filter),
+       mee_enum      ("Hardware Filter",          MA_OPT_HWFILTER, plat_target.hwfilter, men_dummy),
 #ifdef HAVE_NEON32
        mee_enum      ("Scanlines",                MA_OPT_SCANLINES, scanlines, men_scanlines),
        mee_range_h   ("Scanline brightness",      MA_OPT_SCANLINE_LEVEL, scanline_level, 0, 100, h_scanline_l),
@@ -2701,7 +2701,7 @@ void menu_init(void)
                me_enable(e_menu_gfx_options, MA_OPT_VSYNC, 0);
 
        me_enable(e_menu_gfx_options, MA_OPT_GAMMA, plat_target.gamma_set != NULL);
-#ifdef HAVE_NEON32
+#ifndef HAVE_NEON32
        me_enable(e_menu_gfx_options, MA_OPT_SWFILTER, 0);
 #endif
        me_enable(e_menu_gfx_options, MA_OPT_VARSCALER, MENU_SHOW_VARSCALER);

diff --git a/frontend/plat_sdl.c b/frontend/plat_sdl.c
index ab056b0..955dec4 100644 (file)
--- a/frontend/plat_sdl.c
+++ b/frontend/plat_sdl.c
@@ -331,7 +331,7 @@ static void gl_finish_pl(void)
 {
   if (plugin_owns_display() && GPU_close != NULL)
     GPU_close();
-  gl_finish();
+  gl_destroy();
 }
 
 static void gl_resize(void)
@@ -352,7 +352,7 @@ static void gl_resize(void)
       return;
     gl_finish_pl();
   }
-  plat_sdl_gl_active = (gl_init(display, window, &gl_quirks, w, h) == 0);
+  plat_sdl_gl_active = (gl_create(window, &gl_quirks, w, h) == 0);
   if (plat_sdl_gl_active)
     gl_w_prev = w, gl_h_prev = h, gl_quirks_prev = gl_quirks;
   else {