Skip to content

Commit 189e0fd

Browse files
Use new video render context API in Display
1 parent 4050e25 commit 189e0fd

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

obs-studio-server/source/nodeobs_display.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1425,9 +1425,10 @@ void OBS::Display::DisplayCallback(void *displayPtr, uint32_t cx, uint32_t cy)
14251425
gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
14261426
gs_eparam_t *solid_color = gs_effect_get_param_by_name(solid, "color");
14271427
gs_technique_t *solid_tech = gs_effect_get_technique(solid, "Solid");
1428+
obs_core_video_mix_t *renderMix = dp->m_canvas ? obs_video_mix_get(dp->m_canvas, dp->m_renderingMode) : nullptr;
14281429

1429-
if (dp->m_canvas)
1430-
obs_set_video_rendering_canvas(dp->m_canvas);
1430+
obs_set_video_render_context(renderMix);
1431+
obs_set_video_rendering_mode(dp->m_renderingMode);
14311432

14321433
dp->UpdatePreviewArea();
14331434

@@ -1512,12 +1513,6 @@ void OBS::Display::DisplayCallback(void *displayPtr, uint32_t cx, uint32_t cy)
15121513

15131514
// Source Rendering
15141515
if (dp->m_source) {
1515-
/* If the source is a transition it means this display
1516-
* is for Studio Mode and that the scene it contains is a
1517-
* duplicate of the current scene, apply selective recording
1518-
* layer rendering if it is enabled */
1519-
if (obs_get_multiple_rendering() && obs_source_get_type(dp->m_source) == OBS_SOURCE_TYPE_TRANSITION)
1520-
obs_set_video_rendering_mode(dp->m_renderingMode);
15211516
obs_source_video_render(dp->m_source);
15221517
} else {
15231518
obs_render_texture(dp->m_canvas, dp->m_renderingMode);

0 commit comments

Comments
 (0)