Skip to content

Commit

Permalink
Fix videoMap with r_smp 1
Browse files Browse the repository at this point in the history
It was broken due to a stray call to R_SyncRenderThread in a backend
function.

Fixes DaemonEngine#1263.
  • Loading branch information
slipher committed Aug 26, 2024
1 parent 8fb89c3 commit 5c15f16
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/engine/renderer/tr_backend.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/engine/renderer/tr_cmds.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5c15f16

Please sign in to comment.