Skip to content

Commit 824c595

Browse files
committed
Warn when loading non-2D shaders before map
Since the necessity of sRGB conversions is not known.
1 parent fae6ddd commit 824c595

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

src/engine/client/cl_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2141,7 +2141,7 @@ bool CL_InitRenderer()
21412141
FS_FCloseFile( f );
21422142
}
21432143

2144-
cls.whiteShader = re.RegisterShader( "white", RSF_NOMIP );
2144+
cls.whiteShader = re.RegisterShader( "white", RSF_NOMIP | RSF_2D );
21452145

21462146
g_console_field_width = cls.windowConfig.vidWidth / SMALLCHAR_WIDTH - 2;
21472147
g_consoleField.SetWidth(g_console_field_width);

src/engine/client/client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ struct clientStatic_t
316316
// rendering info
317317
WindowConfig windowConfig;
318318
qhandle_t charSetShader;
319-
qhandle_t whiteShader;
319+
qhandle_t whiteShader; // used for console drawing
320320
bool useLegacyConsoleFont;
321321
bool useLegacyConsoleFace;
322322
fontInfo_t *consoleFont;

src/engine/renderer/tr_shader.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6050,6 +6050,11 @@ shader_t *R_FindShader( const char *name, int flags )
60506050
// going to have to upload an image
60516051
R_SyncRenderThread();
60526052

6053+
if ( !( flags & RSF_2D ) && !tr.worldMapLoaded )
6054+
{
6055+
Log::Warn( "non-2D shader '%s' registered before map colorspace is known, assuming naive blending", name );
6056+
}
6057+
60536058
ClearGlobalShader();
60546059

60556060
Q_strncpyz( shader.name, strippedName, sizeof( shader.name ) );

0 commit comments

Comments
 (0)