mirror/obs-studio
1
0 Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-20 13:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "libobs: Enable fast clear on Windows always"

Browse Source 
This reverts commit c2afa58125.
This commit is contained in:
Ryan Foster committed 2023-03-27 15:24:52 -04:00
1 parent 050d2e69b3
commit bfb8fba066
2 files changed
+25 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libobs/obs-display.c
+24 -21
View File
@@ -19,19 +19,22 @@
#include "obs.h"
#include "obs-internal.h"
#if defined(__APPLE__)
/* Apple Silicon GL driver doesn't seem to track SRGB clears correctly */
#define OBS_USE_CLEAR_WORKAROUND 1
#else
#define OBS_USE_CLEAR_WORKAROUND 0
#endif
bool obs_display_init(struct obs_display *display,
const struct gs_init_data *graphics_data)
{
pthread_mutex_init_value(&display->draw_callbacks_mutex);
pthread_mutex_init_value(&display->draw_info_mutex);
#if defined(_WIN32)
/* Conservative test for NVIDIA flickering in multi-GPU setups */
display->use_clear_workaround = gs_get_adapter_count() > 1;
#elif defined(__APPLE__)
/* Apple Silicon GL driver doesn't seem to track SRGB clears correctly */
display->use_clear_workaround = true;
#else
display->use_clear_workaround = false;
#endif
if (graphics_data) {
display->swap = gs_swapchain_create(graphics_data);
if (!display->swap) {
@@ -200,12 +203,11 @@ static inline bool render_display_begin(struct obs_display *display,
display->background_color);
clear_color.w = 1.0f;
#if OBS_USE_CLEAR_WORKAROUND
const uint32_t clear_flags = GS_CLEAR_DEPTH | GS_CLEAR_STENCIL;
#else
const uint32_t clear_flags = GS_CLEAR_COLOR | GS_CLEAR_DEPTH |
GS_CLEAR_STENCIL;
#endif
const bool use_clear_workaround = display->use_clear_workaround;
uint32_t clear_flags = GS_CLEAR_DEPTH | GS_CLEAR_STENCIL;
if (!use_clear_workaround)
clear_flags |= GS_CLEAR_COLOR;
gs_clear(clear_flags, &clear_color, 1.0f, 0);
gs_enable_depth_test(false);
@@ -215,14 +217,15 @@ static inline bool render_display_begin(struct obs_display *display,
gs_ortho(0.0f, (float)cx, 0.0f, (float)cy, -100.0f, 100.0f);
gs_set_viewport(0, 0, cx, cy);
#if OBS_USE_CLEAR_WORKAROUND
gs_effect_t *const solid_effect = obs->video.solid_effect;
gs_effect_set_vec4(gs_effect_get_param_by_name(solid_effect,
"color"),
&clear_color);
while (gs_effect_loop(solid_effect, "Solid"))
gs_draw_sprite(NULL, 0, cx, cy);
#endif
if (use_clear_workaround) {
gs_effect_t *const solid_effect =
obs->video.solid_effect;
gs_effect_set_vec4(gs_effect_get_param_by_name(
solid_effect, "color"),
&clear_color);
while (gs_effect_loop(solid_effect, "Solid"))
gs_draw_sprite(NULL, 0, cx, cy);
}
}
return success;
libobs/obs-internal.h
+1
View File
@@ -229,6 +229,7 @@ struct obs_display {
pthread_mutex_t draw_callbacks_mutex;
pthread_mutex_t draw_info_mutex;
DARRAY(struct draw_callback) draw_callbacks;
bool use_clear_workaround;
struct obs_display *next;
struct obs_display **prev_next;