e541e170a3
For displays, instead of using the draw_callbacks_mutex and risk a reverse mutual lock scenario, use a separate mutex to lock display size data. This bug was exposed when trying to reorder filters in the UI module. The UI thread would try to reorder the filters, locking the filter mutex of the source, and then the reorder would signal the UI to resize the display, so the display would lock its draw_callbacks_mutex. Then, in the graphics thread, it would lock the display's draw_callbacks_mutex, try to draw the source, and then the source would try to lock that same filter mutex. A mutex trace: UI thread -> lock source filter mutex -> waiting on display mutex graphics thread -> lock display mutex -> waiting on source filter mutex Closes jp9000/obs-studio#714
233 lines
5.9 KiB
C
233 lines
5.9 KiB
C
/******************************************************************************
|
|
Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
******************************************************************************/
|
|
|
|
#include "graphics/vec4.h"
|
|
#include "obs.h"
|
|
#include "obs-internal.h"
|
|
|
|
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 (graphics_data) {
|
|
display->swap = gs_swapchain_create(graphics_data);
|
|
if (!display->swap) {
|
|
blog(LOG_ERROR, "obs_display_init: Failed to "
|
|
"create swap chain");
|
|
return false;
|
|
}
|
|
|
|
display->cx = graphics_data->cx;
|
|
display->cy = graphics_data->cy;
|
|
}
|
|
|
|
if (pthread_mutex_init(&display->draw_callbacks_mutex, NULL) != 0) {
|
|
blog(LOG_ERROR, "obs_display_init: Failed to create mutex");
|
|
return false;
|
|
}
|
|
if (pthread_mutex_init(&display->draw_info_mutex, NULL) != 0) {
|
|
blog(LOG_ERROR, "obs_display_init: Failed to create mutex");
|
|
return false;
|
|
}
|
|
|
|
display->background_color = 0x4C4C4C;
|
|
display->enabled = true;
|
|
return true;
|
|
}
|
|
|
|
obs_display_t *obs_display_create(const struct gs_init_data *graphics_data)
|
|
{
|
|
struct obs_display *display = bzalloc(sizeof(struct obs_display));
|
|
|
|
gs_enter_context(obs->video.graphics);
|
|
|
|
if (!obs_display_init(display, graphics_data)) {
|
|
obs_display_destroy(display);
|
|
display = NULL;
|
|
} else {
|
|
pthread_mutex_lock(&obs->data.displays_mutex);
|
|
display->prev_next = &obs->data.first_display;
|
|
display->next = obs->data.first_display;
|
|
obs->data.first_display = display;
|
|
if (display->next)
|
|
display->next->prev_next = &display->next;
|
|
pthread_mutex_unlock(&obs->data.displays_mutex);
|
|
}
|
|
|
|
gs_leave_context();
|
|
|
|
return display;
|
|
}
|
|
|
|
void obs_display_free(obs_display_t *display)
|
|
{
|
|
pthread_mutex_destroy(&display->draw_callbacks_mutex);
|
|
pthread_mutex_destroy(&display->draw_info_mutex);
|
|
da_free(display->draw_callbacks);
|
|
|
|
if (display->swap) {
|
|
gs_swapchain_destroy(display->swap);
|
|
display->swap = NULL;
|
|
}
|
|
}
|
|
|
|
void obs_display_destroy(obs_display_t *display)
|
|
{
|
|
if (display) {
|
|
pthread_mutex_lock(&obs->data.displays_mutex);
|
|
if (display->prev_next)
|
|
*display->prev_next = display->next;
|
|
if (display->next)
|
|
display->next->prev_next = display->prev_next;
|
|
pthread_mutex_unlock(&obs->data.displays_mutex);
|
|
|
|
obs_enter_graphics();
|
|
obs_display_free(display);
|
|
obs_leave_graphics();
|
|
|
|
bfree(display);
|
|
}
|
|
}
|
|
|
|
void obs_display_resize(obs_display_t *display, uint32_t cx, uint32_t cy)
|
|
{
|
|
if (!display) return;
|
|
|
|
pthread_mutex_lock(&display->draw_info_mutex);
|
|
|
|
display->cx = cx;
|
|
display->cy = cy;
|
|
display->size_changed = true;
|
|
|
|
pthread_mutex_unlock(&display->draw_info_mutex);
|
|
}
|
|
|
|
void obs_display_add_draw_callback(obs_display_t *display,
|
|
void (*draw)(void *param, uint32_t cx, uint32_t cy),
|
|
void *param)
|
|
{
|
|
if (!display) return;
|
|
|
|
struct draw_callback data = {draw, param};
|
|
|
|
pthread_mutex_lock(&display->draw_callbacks_mutex);
|
|
da_push_back(display->draw_callbacks, &data);
|
|
pthread_mutex_unlock(&display->draw_callbacks_mutex);
|
|
}
|
|
|
|
void obs_display_remove_draw_callback(obs_display_t *display,
|
|
void (*draw)(void *param, uint32_t cx, uint32_t cy),
|
|
void *param)
|
|
{
|
|
if (!display) return;
|
|
|
|
struct draw_callback data = {draw, param};
|
|
|
|
pthread_mutex_lock(&display->draw_callbacks_mutex);
|
|
da_erase_item(display->draw_callbacks, &data);
|
|
pthread_mutex_unlock(&display->draw_callbacks_mutex);
|
|
}
|
|
|
|
static inline void render_display_begin(struct obs_display *display,
|
|
uint32_t cx, uint32_t cy, bool size_changed)
|
|
{
|
|
struct vec4 clear_color;
|
|
|
|
gs_load_swapchain(display ? display->swap : NULL);
|
|
|
|
if (size_changed)
|
|
gs_resize(cx, cy);
|
|
|
|
gs_begin_scene();
|
|
|
|
vec4_from_rgba(&clear_color, display->background_color);
|
|
clear_color.w = 1.0f;
|
|
|
|
gs_clear(GS_CLEAR_COLOR | GS_CLEAR_DEPTH | GS_CLEAR_STENCIL,
|
|
&clear_color, 1.0f, 0);
|
|
|
|
gs_enable_depth_test(false);
|
|
/* gs_enable_blending(false); */
|
|
gs_set_cull_mode(GS_NEITHER);
|
|
|
|
gs_ortho(0.0f, (float)cx, 0.0f, (float)cy, -100.0f, 100.0f);
|
|
gs_set_viewport(0, 0, cx, cy);
|
|
}
|
|
|
|
static inline void render_display_end()
|
|
{
|
|
gs_end_scene();
|
|
gs_present();
|
|
}
|
|
|
|
void render_display(struct obs_display *display)
|
|
{
|
|
uint32_t cx, cy;
|
|
bool size_changed;
|
|
|
|
if (!display || !display->enabled) return;
|
|
|
|
/* -------------------------------------------- */
|
|
|
|
pthread_mutex_lock(&display->draw_info_mutex);
|
|
|
|
cx = display->cx;
|
|
cy = display->cy;
|
|
size_changed = display->size_changed;
|
|
|
|
if (size_changed)
|
|
display->size_changed = false;
|
|
|
|
pthread_mutex_unlock(&display->draw_info_mutex);
|
|
|
|
/* -------------------------------------------- */
|
|
|
|
render_display_begin(display, cx, cy, size_changed);
|
|
|
|
pthread_mutex_lock(&display->draw_callbacks_mutex);
|
|
|
|
for (size_t i = 0; i < display->draw_callbacks.num; i++) {
|
|
struct draw_callback *callback;
|
|
callback = display->draw_callbacks.array+i;
|
|
|
|
callback->draw(callback->param, cx, cy);
|
|
}
|
|
|
|
pthread_mutex_unlock(&display->draw_callbacks_mutex);
|
|
|
|
render_display_end();
|
|
}
|
|
|
|
void obs_display_set_enabled(obs_display_t *display, bool enable)
|
|
{
|
|
if (display)
|
|
display->enabled = enable;
|
|
}
|
|
|
|
bool obs_display_enabled(obs_display_t *display)
|
|
{
|
|
return display ? display->enabled : false;
|
|
}
|
|
|
|
void obs_display_set_background_color(obs_display_t *display, uint32_t color)
|
|
{
|
|
if (display)
|
|
display->background_color = color;
|
|
}
|