Merge branch 'master' into hdr_upgrade

Author: MajorPainTheCactus

Makefile.webos

@@ -325,9 +325,13 @@ clean:
 
 sdl2: $(TARGET)
 ifeq ($(ADD_SDL2_LIB), 1)
-	@echo "Downloading SDL2 prebuilt"
-	mkdir -p SDL
-	wget -qO - $(SDL2_PREBUILT_ARCHIVE) | tar -C SDL -zxvf -
+	@if [ ! -f SDL/lib/libSDL2-2.0.so.0 ]; then \
+		echo "Downloading SDL2 prebuilt"; \
+		mkdir -p SDL; \
+		wget -qO - $(SDL2_PREBUILT_ARCHIVE) | tar -C SDL -zxvf -; \
+	else \
+		echo "SDL2 prebuilt already exists, skipping download"; \
+	fi
 endif
 
 ipk: prebuild $(TARGET) sdl2

command.c

@@ -2369,17 +2369,6 @@ bool command_event_disk_control_append_image(
       autosave_deinit();
 #endif
 
-   /* TODO/FIXME: Need to figure out what to do with subsystems case. */
-   if (path_is_empty(RARCH_PATH_SUBSYSTEM))
-   {
-      /* Update paths for our new image.
-       * If we actually use append_image, we assume that we
-       * started out in a single disk case, and that this way
-       * of doing it makes the most sense. */
-      path_set(RARCH_PATH_NAMES, path);
-      runloop_path_fill_names();
-   }
-
    command_event(CMD_EVENT_AUTOSAVE_INIT, NULL);
 
    return true;

config.def.h

@@ -1915,4 +1915,8 @@
 
 #ifdef HAVE_SMBCLIENT
 #define DEFAULT_SMB_CLIENT_AUTH_MODE 1
+#define DEFAULT_SMB_CLIENT_NUM_CONTEXTS 4
+#define DEFAULT_SMB_CLIENT_MAX_CONTEXTS 20
+#define DEFAULT_SMB_CLIENT_TIMEOUT 5
+#define DEFAULT_SMB_CLIENT_MAX_TIMEOUT 20
 #endif

configuration.c

@@ -2686,6 +2686,12 @@ static struct config_uint_setting *populate_settings_uint(
    SETTING_UINT("input_overlay_mouse_alt_two_touch_input",  &settings->uints.input_overlay_mouse_alt_two_touch_input, true, DEFAULT_INPUT_OVERLAY_MOUSE_ALT_TWO_TOUCH_INPUT, false);
 #endif
 
+#ifdef HAVE_SMBCLIENT
+   SETTING_UINT("smb_client_auth_mode",           &settings->uints.smb_client_auth_mode, true, DEFAULT_SMB_CLIENT_AUTH_MODE, false);
+   SETTING_UINT("smb_client_num_contexts",        &settings->uints.smb_client_num_contexts, true, DEFAULT_SMB_CLIENT_NUM_CONTEXTS, false);
+   SETTING_UINT("smb_client_timeout",             &settings->uints.smb_client_timeout, true, DEFAULT_SMB_CLIENT_TIMEOUT, false);
+#endif
+
    *size = count;
 
    return tmp;
@@ -2764,10 +2770,6 @@ static struct config_int_setting *populate_settings_int(
 #endif
    SETTING_INT("input_turbo_bind",               &settings->ints.input_turbo_bind, true, DEFAULT_TURBO_BIND, false);
 
-#ifdef HAVE_SMBCLIENT
-   SETTING_INT("smb_client_auth_mode",           &settings->ints.smb_client_auth_mode, true, DEFAULT_SMB_CLIENT_AUTH_MODE, false);
-#endif
-
    *size = count;
 
    return tmp;

configuration.h

@@ -155,9 +155,6 @@ typedef struct settings
       int input_overlay_lightgun_port;
 #endif
       int input_turbo_bind;
-#ifdef HAVE_SMBCLIENT
-      int smb_client_auth_mode;
-#endif
    } ints;
 
    struct
@@ -401,6 +398,12 @@ typedef struct settings
 
       unsigned cheevos_appearance_anchor;
       unsigned cheevos_visibility_summary;
+
+#ifdef HAVE_SMBCLIENT
+      unsigned smb_client_auth_mode;
+      unsigned smb_client_num_contexts;
+      unsigned smb_client_timeout;
+#endif
    } uints;
 
    struct

deps/rcheevos/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v12.2.1
+* fix parsing of leaderboards with comparisons in legacy-formatted values
+* fix validation warning on long AddSource chains
+
 # v12.2.0
 * add rc_client_create_subset_list
 * add rc_client_begin_fetch_game_titles

deps/rcheevos/src/rc_version.h

@@ -9,7 +9,7 @@ RC_BEGIN_C_DECLS
 
 #define RCHEEVOS_VERSION_MAJOR 12
 #define RCHEEVOS_VERSION_MINOR 2
-#define RCHEEVOS_VERSION_PATCH 0
+#define RCHEEVOS_VERSION_PATCH 1
 
 #define RCHEEVOS_MAKE_VERSION(major, minor, patch) (major * 1000000 + minor * 1000 + patch)
 #define RCHEEVOS_VERSION RCHEEVOS_MAKE_VERSION(RCHEEVOS_VERSION_MAJOR, RCHEEVOS_VERSION_MINOR, RCHEEVOS_VERSION_PATCH)

deps/rcheevos/src/rcheevos/value.c

@@ -180,9 +180,11 @@ static void rc_parse_legacy_value(rc_value_t* self, const char** memaddr, rc_par
         return;
       }
 
-      if (!rc_operator_is_modifying(cond->oper)) {
-        parse->offset = RC_INVALID_OPERATOR;
-        return;
+      if (cond->type == RC_CONDITION_MEASURED && !rc_operator_is_modifying(cond->oper)) {
+        /* ignore non-modifying operator on measured clause. if it were parsed as an AddSource
+         * or SubSource, that would have already happened in rc_parse_condition_internal, and
+         * legacy formatted values are essentially a series of AddSources. */
+        cond->oper = RC_OPERATOR_NONE;
       }
 
       rc_condition_update_parse_state(cond, parse);

disk_control_interface.c

@@ -342,25 +342,19 @@ bool disk_control_set_eject_state(
    size_t _len;
 
    if (!disk_control || !disk_control->cb.set_eject_state)
-      return false;
+      return err;
 
    /* Set eject state */
    if (disk_control->cb.set_eject_state(eject))
-      _len  = strlcpy(
-            msg,
-            eject
-            ? msg_hash_to_str(MSG_DISK_EJECTED)
-            : msg_hash_to_str(MSG_DISK_CLOSED),
-              sizeof(msg));
+      _len = strlcpy(msg,
+            eject ? msg_hash_to_str(MSG_DISK_EJECTED) : msg_hash_to_str(MSG_DISK_CLOSED),
+            sizeof(msg));
    else
    {
       err  = true;
-      _len = strlcpy(
-            msg,
-            eject
-            ? msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY_EJECT)
-            : msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY_CLOSE),
-              sizeof(msg));
+      _len = strlcpy(msg,
+            eject ? msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY_EJECT) : msg_hash_to_str(MSG_VIRTUAL_DISK_TRAY_CLOSE),
+            sizeof(msg));
    }
 
    if (_len > 0)
@@ -398,9 +392,9 @@ bool disk_control_set_eject_state(
 /**
  * disk_control_set_index:
  *
- * Sets currently selected disk index
- *
- * NOTE: Will fail if disk is not currently ejected
+ * Sets currently selected disk index.
+ * Does silent eject and delayed insert with
+ * 'runloop_st->pending_disk_control_insert' if tray is closed.
  **/
 bool disk_control_set_index(
       disk_control_interface_t *disk_control,
@@ -414,17 +408,26 @@ bool disk_control_set_index(
 
    msg[0] = '\0';
 
-   if (!disk_control)
-      return false;
+   if (     !disk_control
+         || !disk_control->cb.get_eject_state
+         || !disk_control->cb.get_num_images
+         || !disk_control->cb.get_image_index
+         || !disk_control->cb.set_image_index)
+      return err;
 
-   if (   !disk_control->cb.get_eject_state
-       || !disk_control->cb.get_num_images
-       || !disk_control->cb.set_image_index)
-      return false;
+   /* Do nothing if the desired disc is already in */
+   if (disk_control->cb.get_image_index() == index)
+      return !err;
 
-   /* Ensure that disk is currently ejected */
+   /* Do delayed disk insert if changing while not ejected */
    if (!disk_control->cb.get_eject_state())
-      return false;
+   {
+      runloop_state_t *runloop_st = runloop_state_get_ptr();
+
+      if (     runloop_st
+            && disk_control_set_eject_state(disk_control, true, false))
+         runloop_st->pending_disk_control_insert = 100;
+   }
 
    /* Get current number of disk images */
    num_images = disk_control->cb.get_num_images();
@@ -466,7 +469,6 @@ bool disk_control_set_index(
           && disk_control->cb.get_image_path)
       {
          char new_image_path[PATH_MAX_LENGTH] = {0};
-         /* Get current image index + path */
          unsigned new_image_index = disk_control->cb.get_image_index();
          bool image_path_valid    = disk_control->cb.get_image_path(
                new_image_index, new_image_path, sizeof(new_image_path));
@@ -618,22 +620,22 @@ bool disk_control_append_image(
 
    if ((new_index = disk_control->cb.get_num_images()) < 1)
       goto error;
-   new_index--;
 
+   new_index--;
    info.path = image_path;
-   if (!disk_control->cb.replace_image_index(new_index, &info))
-      goto error;
 
-   /* Set new index */
-   if (!disk_control_set_index(disk_control, new_index, false))
+   if (!disk_control->cb.replace_image_index(new_index, &info))
       goto error;
 
-   /* If tray was initially closed, insert disk
-    * (i.e. leave system in the state we found it) */
+   /* If tray was initially closed, insert disk */
    if (   !initial_disk_ejected
        && !disk_control_set_eject_state(disk_control, false, false))
       goto error;
 
+   /* Set new index */
+   if (!disk_control_set_index(disk_control, new_index, false))
+      goto error;
+
    /* Display log */
    _len        = strlcpy(msg, msg_hash_to_str(MSG_APPENDED_DISK), sizeof(msg) - 3);
    msg[  _len] = ':';
@@ -658,11 +660,7 @@ bool disk_control_append_image(
     * NOTE: If this fails then it's game over -
     * just display the error notification and
     * hope for the best... */
-   if (!disk_control->cb.get_eject_state())
-      disk_control_set_eject_state(disk_control, true, false);
    disk_control_set_index(disk_control, initial_index, false);
-   if (!initial_disk_ejected)
-      disk_control_set_eject_state(disk_control, false, false);
 
    _len        = strlcpy(msg,
          msg_hash_to_str(MSG_FAILED_TO_APPEND_DISK), sizeof(msg) - 3);
@@ -672,7 +670,7 @@ bool disk_control_append_image(
    _len += strlcpy(msg + _len, image_filename, sizeof(msg) - _len);
 
    runloop_msg_queue_push(msg, _len, 2, 180, true, NULL,
-         MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_WARNING);
+         MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_ERROR);
 
    return false;
 }

gfx/drivers/d3d11.c

@@ -1630,7 +1630,7 @@ static void d3d11_set_hdr_paper_white_nits(void* data, float paper_white_nits)
    {
       for (unsigned i = 0; i < d3d11->shader_preset->passes; i++)
       {
-         d3d11->pass[i].paper_white_nits  = paper_white_nits;
+         d3d11->pass[i].paper_white_nits     = paper_white_nits;
       }
    }
 }
@@ -3611,7 +3611,7 @@ static bool d3d11_gfx_frame(
 #ifdef HAVE_DXGI_HDR   
          settings_t*    settings = config_get_ptr();
 
-         d3d11->pass[i].enable_hdr           = (d3d11->flags & D3D11_ST_FLAG_HDR_ENABLE) ? 1.0f : 0.0f;
+         d3d11->pass[i].enable_hdr              = (d3d11->flags & D3D11_ST_FLAG_HDR_ENABLE) ? 1.0f : 0.0f;
 
          if(d3d11->flags & D3D11_ST_FLAG_HDR_ENABLE)
          {