D3D12/Vulkan: Fix HDR blend for widgets/OSD text, add gfx_widgets_visible() (#18703)

Author: MajorPainTheCactus

gfx/drivers/d3d12.c

@@ -4642,9 +4642,21 @@ static bool d3d12_gfx_frame(
    cmd->lpVtbl->SetPipelineState(cmd, d3d12->pipes[VIDEO_SHADER_STOCK_BLEND]);
    cmd->lpVtbl->SetGraphicsRootSignature(cmd, d3d12->desc.rootSignature);
 
+#ifdef HAVE_GFX_WIDGETS
+   const bool widgets_visible        = gfx_widgets_visible(video_info);
+#endif
+
+   const bool message_visible         = ((statistics_show) && (osd_params)) || (msg && *msg);
+
 #ifdef HAVE_DXGI_HDR
    if ((d3d12->flags & D3D12_ST_FLAG_HDR_ENABLE) &&
-       ((d3d12->flags & D3D12_ST_FLAG_MENU_ENABLE) || (d3d12->flags & D3D12_ST_FLAG_OVERLAYS_ENABLE)))
+       (    (d3d12->flags & D3D12_ST_FLAG_MENU_ENABLE) 
+         || (d3d12->flags & D3D12_ST_FLAG_OVERLAYS_ENABLE) 
+         || message_visible
+#ifdef HAVE_GFX_WIDGETS       
+         || widgets_visible
+#endif
+      ))
    {
       d3d12->chain.current_rt_format = d3d12->chain.back_buffer.desc.Format;
 
@@ -4762,7 +4774,13 @@ static bool d3d12_gfx_frame(
 #ifdef HAVE_DXGI_HDR
    /* Copy over back buffer to swap chain render targets */
    if ((d3d12->flags & D3D12_ST_FLAG_HDR_ENABLE) && 
-       ((d3d12->flags & D3D12_ST_FLAG_MENU_ENABLE) || (d3d12->flags & D3D12_ST_FLAG_OVERLAYS_ENABLE)))
+       (    (d3d12->flags & D3D12_ST_FLAG_MENU_ENABLE) 
+         || (d3d12->flags & D3D12_ST_FLAG_OVERLAYS_ENABLE) 
+         || message_visible
+#ifdef HAVE_GFX_WIDGETS       
+         || widgets_visible
+#endif
+      ))
    {
       D3D12_RESOURCE_TRANSITION(
             cmd,

gfx/drivers/vulkan.c

@@ -5159,8 +5159,19 @@ static bool vulkan_frame(void *data, const void *frame,
          end_main_pass = false;
       }
 
+      const bool message_visible = !string_is_empty(msg);
+
+#ifdef HAVE_GFX_WIDGETS
+      const bool widgets_visible = gfx_widgets_visible(video_info);
+#endif
+
       if ((vk->context->flags & VK_CTX_FLAG_HDR_ENABLE) &&
-          ((vk->flags & VK_FLAG_MENU_ENABLE) || (vk->flags & VK_FLAG_OVERLAY_ENABLE)) &&
+          ((vk->flags & VK_FLAG_MENU_ENABLE) || (vk->flags & VK_FLAG_OVERLAY_ENABLE)
+         || message_visible
+#ifdef HAVE_GFX_WIDGETS       
+         || widgets_visible
+#endif
+         ) &&
           (vk->offscreen_buffer.image != VK_NULL_HANDLE))
       {
          if(end_pass) vkCmdEndRenderPass(vk->cmd);
@@ -5242,7 +5253,7 @@ static bool vulkan_frame(void *data, const void *frame,
          vulkan_render_overlay(vk, video_width, video_height);
 #endif
 
-      if (!string_is_empty(msg))
+      if (message_visible)
           font_driver_render_msg(vk, msg, NULL, NULL);
 
 #ifdef HAVE_GFX_WIDGETS
@@ -5256,7 +5267,12 @@ static bool vulkan_frame(void *data, const void *frame,
 #ifdef VULKAN_HDR_SWAPCHAIN
       /* Copy over back buffer to swap chain render targets */
       if ((vk->context->flags & VK_CTX_FLAG_HDR_ENABLE) &&
-          ((vk->flags & VK_FLAG_MENU_ENABLE) || (vk->flags & VK_FLAG_OVERLAY_ENABLE)) &&
+          ((vk->flags & VK_FLAG_MENU_ENABLE) || (vk->flags & VK_FLAG_OVERLAY_ENABLE)
+         || message_visible
+#ifdef HAVE_GFX_WIDGETS       
+         || widgets_visible
+#endif
+         ) &&
           (vk->offscreen_buffer.image != VK_NULL_HANDLE))
       {
          backbuffer = &vk->backbuffers[swapchain_index];

gfx/gfx_widgets.c

@@ -1543,6 +1543,54 @@ static void gfx_widgets_draw_regular_msg(
    }
 }
 
+bool gfx_widgets_visible(void *data)
+{
+   size_t i;
+   video_frame_info_t *video_info = (video_frame_info_t*)data;
+   dispgfx_widget_t *p_dispwidget = (dispgfx_widget_t*)video_info->widgets_userdata;
+   bool fps_show                  = video_info->fps_show;
+   bool framecount_show           = video_info->framecount_show;
+   bool memory_show               = video_info->memory_show;
+   bool core_status_msg_show      = video_info->core_status_msg_show;
+   bool widgets_is_paused         = (video_info->video_st_flags & VIDEO_FLAG_WIDGETS_PAUSED) ? true : false;
+   bool widgets_is_fastforwarding  = (video_info->video_st_flags & VIDEO_FLAG_WIDGETS_FAST_FORWARD) ? true : false;
+   bool widgets_is_rewinding      = (video_info->video_st_flags & VIDEO_FLAG_WIDGETS_REWINDING) ? true : false;
+   bool runloop_is_slowmotion     = video_info->runloop_is_slowmotion;
+   bool notifications_hidden      = video_info->notifications_hidden || video_info->msg_queue_delay;
+
+#ifdef HAVE_MENU
+   if ((video_info->menu_st_flags & MENU_ST_FLAG_SCREENSAVER_ACTIVE))
+      return false;
+#endif
+
+   if (notifications_hidden)
+      return false;
+
+#ifdef HAVE_TRANSLATE
+   if (p_dispwidget->ai_service_overlay_state > 0)
+      return true;
+#endif
+
+   if (fps_show || framecount_show || memory_show || core_status_msg_show)
+      return true;
+
+   if (widgets_is_paused || widgets_is_fastforwarding
+         || widgets_is_rewinding || runloop_is_slowmotion)
+      return true;
+
+   for (i = 0; i < ARRAY_SIZE(widgets); i++)
+   {
+      const gfx_widget_t* widget = widgets[i];
+      if (widget->visible && widget->visible())
+         return true;
+   }
+
+   if (p_dispwidget->current_msgs_size)
+      return true;
+
+   return false;
+}
+
 void gfx_widgets_frame(void *data)
 {
    size_t i;

gfx/gfx_widgets.h

@@ -309,6 +309,11 @@ struct gfx_widget
     * -- userdata is a dispgfx_widget_t
     * -> draw the widget here */
    void (*frame)(void* data, void *userdata);
+
+   /* called to check if the widget is currently
+    * drawing anything on screen
+    * -> return true if the widget is active */
+   bool (*visible)(void);
 };
 
 float gfx_widgets_get_thumbnail_scale_factor(
@@ -417,6 +422,8 @@ bool gfx_widget_start_load_content_animation(void);
  * enable_menu_widgets to true for that driver */
 void gfx_widgets_frame(void *data);
 
+bool gfx_widgets_visible(void *data);
+
 bool gfx_widgets_ready(void);
 
 dispgfx_widget_t *dispwidget_get_ptr(void);

gfx/widgets/gfx_widget_achievement_popup.c

@@ -632,12 +632,20 @@ void gfx_widgets_push_achievement(const char* title, const char* subtitle, const
 #endif
 }
 
+static bool gfx_widget_achievement_popup_visible(void)
+{
+   gfx_widget_achievement_popup_state_t *state = &p_w_achievement_popup_st;
+   return state->queue_read_index >= 0
+      && state->queue[state->queue_read_index].title;
+}
+
 const gfx_widget_t gfx_widget_achievement_popup = {
    &gfx_widget_achievement_popup_init,
    &gfx_widget_achievement_popup_free,
    NULL, /* context_reset*/
    &gfx_widget_achievement_popup_context_destroy,
    NULL, /* layout */
    NULL, /* iterate */
-   &gfx_widget_achievement_popup_frame
+   &gfx_widget_achievement_popup_frame,
+   &gfx_widget_achievement_popup_visible
 };

gfx/widgets/gfx_widget_generic_message.c

@@ -557,12 +557,19 @@ static void gfx_widget_generic_message_free(void)
 
 /* Widget definition */
 
+static bool gfx_widget_generic_message_visible(void)
+{
+   gfx_widget_generic_message_state_t *state = &p_w_generic_message_st;
+   return state->status != GFX_WIDGET_GENERIC_MESSAGE_IDLE;
+}
+
 const gfx_widget_t gfx_widget_generic_message = {
    NULL, /* init */
    gfx_widget_generic_message_free,
    NULL, /* context_reset*/
    NULL, /* context_destroy */
    gfx_widget_generic_message_layout,
    gfx_widget_generic_message_iterate,
-   gfx_widget_generic_message_frame
+   gfx_widget_generic_message_frame,
+   gfx_widget_generic_message_visible
 };

gfx/widgets/gfx_widget_leaderboard_display.c

@@ -635,12 +635,24 @@ void gfx_widget_set_cheevos_set_loading(bool value)
 }
 
 
+static bool gfx_widget_leaderboard_display_visible(void)
+{
+   gfx_widget_leaderboard_display_state_t *state =
+      &p_w_leaderboard_display_st;
+   return state->tracker_count != 0
+      || state->challenge_count != 0
+      || state->progress_tracker.show_until != 0
+      || state->loading
+      || state->disconnected;
+}
+
 const gfx_widget_t gfx_widget_leaderboard_display = {
    &gfx_widget_leaderboard_display_init,
    &gfx_widget_leaderboard_display_free,
    NULL, /* context_reset*/
    &gfx_widget_leaderboard_display_context_destroy,
    NULL, /* layout */
    NULL, /* iterate */
-   &gfx_widget_leaderboard_display_frame
+   &gfx_widget_leaderboard_display_frame,
+   &gfx_widget_leaderboard_display_visible
 };

gfx/widgets/gfx_widget_libretro_message.c

@@ -500,12 +500,19 @@ static void gfx_widget_libretro_message_free(void)
 
 /* Widget definition */
 
+static bool gfx_widget_libretro_message_visible(void)
+{
+   gfx_widget_libretro_message_state_t *state = &p_w_libretro_message_st;
+   return state->status != GFX_WIDGET_LIBRETRO_MESSAGE_IDLE;
+}
+
 const gfx_widget_t gfx_widget_libretro_message = {
    NULL, /* init */
    gfx_widget_libretro_message_free,
    NULL, /* context_reset*/
    NULL, /* context_destroy */
    gfx_widget_libretro_message_layout,
    gfx_widget_libretro_message_iterate,
-   gfx_widget_libretro_message_frame
+   gfx_widget_libretro_message_frame,
+   gfx_widget_libretro_message_visible
 };

gfx/widgets/gfx_widget_load_content_animation.c

@@ -1012,12 +1012,20 @@ static bool gfx_widget_load_content_animation_init(
 }
 /* Widget definition */
 
+static bool gfx_widget_load_content_animation_visible(void)
+{
+   gfx_widget_load_content_animation_state_t *state =
+      &p_w_load_content_animation_st;
+   return state->status != GFX_WIDGET_LOAD_CONTENT_IDLE;
+}
+
 const gfx_widget_t gfx_widget_load_content_animation = {
    gfx_widget_load_content_animation_init,
    gfx_widget_load_content_animation_free,
    gfx_widget_load_content_animation_context_reset,
    gfx_widget_load_content_animation_context_destroy,
    gfx_widget_load_content_animation_layout,
    gfx_widget_load_content_animation_iterate,
-   gfx_widget_load_content_animation_frame
+   gfx_widget_load_content_animation_frame,
+   gfx_widget_load_content_animation_visible
 };

gfx/widgets/gfx_widget_progress_message.c

@@ -334,12 +334,19 @@ static void gfx_widget_progress_message_free(void)
 
 /* Widget definition */
 
+static bool gfx_widget_progress_message_visible(void)
+{
+   gfx_widget_progress_message_state_t *state = &p_w_progress_message_st;
+   return state->active;
+}
+
 const gfx_widget_t gfx_widget_progress_message = {
    NULL, /* init */
    gfx_widget_progress_message_free,
    NULL, /* context_reset*/
    NULL, /* context_destroy */
    gfx_widget_progress_message_layout,
    NULL, /* iterate */
-   gfx_widget_progress_message_frame
+   gfx_widget_progress_message_frame,
+   gfx_widget_progress_message_visible
 };