Skip to content

Commit 010dc02

Browse files
committed
renderer: rename r_msaa as r_MSAA
1 parent 118d826 commit 010dc02

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/engine/renderer/tr_init.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ Cvar::Cvar<int> r_rendererAPI( "r_rendererAPI", "Renderer API: 0: OpenGL, 1: Vul
291291
Cvar::Cvar<bool> r_FXAA( "r_FXAA", "Fast approximate anti-aliasing", Cvar::NONE, false );
292292
Cvar::Cvar<bool> r_showFXAA( "r_showFXAA", "Show pixels modified by FXAA", Cvar::CHEAT, false );
293293

294-
Cvar::Range<Cvar::Cvar<int>> r_msaa( "r_msaa", "Amount of MSAA samples. 0 to disable", Cvar::NONE, 0, 0, 64 );
294+
Cvar::Range<Cvar::Cvar<int>> r_MSAA( "r_MSAA", "Amount of MSAA samples. 0 to disable", Cvar::NONE, 0, 0, 64 );
295295

296296
Cvar::Range<Cvar::Cvar<int>> r_ssao( "r_ssao",
297297
"Screen space ambient occlusion: "
@@ -1218,7 +1218,7 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
12181218
Cvar::Latch( r_FXAA );
12191219
Cvar::Latch( r_showFXAA );
12201220

1221-
Cvar::Latch( r_msaa );
1221+
Cvar::Latch( r_MSAA );
12221222

12231223
// temporary variables that can change at any time
12241224
r_showImages = Cvar_Get( "r_showImages", "0", CVAR_TEMP );

src/engine/renderer/tr_local.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2788,7 +2788,7 @@ enum
27882788
extern Cvar::Cvar<bool> r_FXAA;
27892789
extern Cvar::Cvar<bool> r_showFXAA;
27902790

2791-
extern Cvar::Range<Cvar::Cvar<int>> r_msaa;
2791+
extern Cvar::Range<Cvar::Cvar<int>> r_MSAA;
27922792

27932793
extern cvar_t *r_evsmPostProcess;
27942794

src/engine/renderer/tr_shade.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,14 @@ static void EnableAvailableFeatures()
181181
}
182182

183183
if ( std::make_pair( glConfig.glMajor, glConfig.glMinor ) >= std::make_pair( 3, 2 ) ) {
184-
glConfig.MSAA = r_msaa.Get();
184+
glConfig.MSAA = r_MSAA.Get();
185185
const int maxSamples = std::min( glConfig.maxColorTextureSamples, glConfig.maxDepthTextureSamples );
186186

187187
if ( glConfig.MSAA > maxSamples ) {
188-
Log::Warn( "MSAA samples %i > %i, setting to %i", r_msaa.Get(), maxSamples, maxSamples );
188+
Log::Warn( "MSAA samples %i > %i, setting to %i", r_MSAA.Get(), maxSamples, maxSamples );
189189
glConfig.MSAA = maxSamples;
190190
}
191-
} else if ( r_msaa.Get() ) {
191+
} else if ( r_MSAA.Get() ) {
192192
Log::Warn( "MSAA unavailable because GL version is lower than required (%i.%i < %i.%i)", glConfig.glMajor, glConfig.glMinor, 3, 2 );
193193
}
194194

0 commit comments

Comments
 (0)