Merge branch 'master' into libretro

Author: notaz

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)

configure

@@ -519,17 +519,6 @@ EOF
   fi
 fi
 
-# check for VideoCore stuff for Raspberry Pi
-if [ -d /opt/vc/include -a -d /opt/vc/lib -a "$VIDEOCORE" != "no" ]; then
-  CFLAGS_GLES="$CFLAGS_GLES -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
-  LDLIBS_GLES="$LDLIBS_GLES -L/opt/vc/lib"
-  if [ -f /opt/vc/lib/libbcm_host.so ]; then
-    LDLIBS_GLES="$LDLIBS_GLES -lbcm_host"
-  fi
-  need_xlib="yes"
-  VIDEOCORE="yes"
-fi
-
 # check for GLES headers
 cat > $TMPC <<EOF
 #include <GLES/gl.h>
@@ -538,15 +527,14 @@ int main(void) {
   return (int)eglGetDisplay( (EGLNativeDisplayType)0 );
 }
 EOF
-if [ "$VIDEOCORE" = "yes" ] && compile_binary $CFLAGS_GLES -lbrcmEGL -lbrcmGLESv2 $LDLIBS_GLES; then
-  have_gles="yes"
-  LDLIBS_GLES="-lbrcmEGL -lbrcmGLESv2 $LDLIBS_GLES"
-elif compile_binary $CFLAGS_GLES -lEGL -lGLES_CM $LDLIBS_GLES; then
+if compile_binary $CFLAGS_GLES -lEGL -lGLES_CM $LDLIBS_GLES; then
   have_gles="yes"
   LDLIBS_GLES="-lEGL -lGLES_CM $LDLIBS_GLES"
 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
@@ -563,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

frontend/libpicofe

@@ -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),
@@ -1452,6 +1452,7 @@ static menu_entry e_menu_plugin_gpu_unai[] =
 	mee_onoff     ("Lighting",                   0, pl_rearmed_cbs.gpu_unai.lighting, 1),
 	mee_onoff     ("Fast lighting",              0, pl_rearmed_cbs.gpu_unai.fast_lighting, 1),
 	mee_onoff     ("Blending",                   0, pl_rearmed_cbs.gpu_unai.blending, 1),
+	mee_onoff     ("Downscale Hi-Res",           0, pl_rearmed_cbs.gpu_unai.scale_hires, 1),
 	mee_end,
 };
 
@@ -2701,7 +2702,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);

frontend/menu.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 {
@@ -774,6 +774,7 @@ void plat_video_menu_leave(void)
     change_mode(fs_w, fs_h);
   overlay_or_gl_check_enable();
   centered_clear();
+  setup_blit_callbacks(psx_w, psx_h);
 
   for (d = 0; d < IN_MAX_DEVS; d++)
     in_set_config_int(d, IN_CFG_ANALOG_MAP_ULDR, 0);

frontend/plat_sdl.c

@@ -1494,6 +1494,14 @@ int ISOopen(const char *fname)
 			isMode1ISO = TRUE;
 		}
 	}
+	if (cdHandle && numtracks == 0) {
+		// assume some metadata-less format
+		numtracks = 1;
+		ti[1].type = DATA;
+		ti[1].start_offset = 0;
+		sec2msf(2 * 75, ti[1].start);
+		sec2msf(isMode1ISO ? size_main / 2048u : size_main / 2352u, ti[1].length);
+	}
 
 	SysPrintf("%s (%lld bytes).\n", image_str, (long long)size_main);