From 5c15f16a35f5ec4d78ae0eaa291854f7766e7627 Mon Sep 17 00:00:00 2001 From: slipher Date: Sun, 25 Aug 2024 08:09:36 -0500 Subject: [PATCH] Fix videoMap with r_smp 1 It was broken due to a stray call to R_SyncRenderThread in a backend function. Fixes #1263. --- src/engine/renderer/tr_backend.cpp | 2 -- src/engine/renderer/tr_cmds.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/renderer/tr_backend.cpp b/src/engine/renderer/tr_backend.cpp index 3445d9d8f9..a1b4e3bdb6 100644 --- a/src/engine/renderer/tr_backend.cpp +++ b/src/engine/renderer/tr_backend.cpp @@ -4994,8 +4994,6 @@ RENDER BACK END THREAD FUNCTIONS void RE_UploadCinematic( int cols, int rows, const byte *data, int client, bool dirty ) { - R_SyncRenderThread(); - GL_Bind( tr.cinematicImage[ client ] ); // if the scratchImage isn't in the format we want, specify it as a new texture diff --git a/src/engine/renderer/tr_cmds.cpp b/src/engine/renderer/tr_cmds.cpp index 1db76fd5e0..ec5da2f47e 100644 --- a/src/engine/renderer/tr_cmds.cpp +++ b/src/engine/renderer/tr_cmds.cpp @@ -201,6 +201,8 @@ OpenGL calls until R_IssueRenderCommands is called. */ void R_SyncRenderThread() { + ASSERT( Sys::OnMainThread() ); // only call this from the frontend + if ( !tr.registered ) { return;