Skip to content

Commit 894db38

Browse files
committed
renderer: rename r_ssao as r_SSAO
1 parent a09f696 commit 894db38

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

src/engine/renderer/GLUtils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ struct GLConfig
158158
bool bloom;
159159
bool FXAA; // automatically disabled when MSAA is not null
160160
int MSAA; // 0 == disabled, otherwise used as sample count
161-
bool ssao;
161+
bool SSAO;
162162
bool motionBlur;
163163
};
164164

src/engine/renderer/tr_backend.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ void RB_RenderMotionBlur()
15521552

15531553
void RB_RenderSSAO()
15541554
{
1555-
if ( !glConfig.ssao )
1555+
if ( !glConfig.SSAO )
15561556
{
15571557
return;
15581558
}
@@ -1570,7 +1570,7 @@ void RB_RenderSSAO()
15701570
GL_State( GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO );
15711571
GL_Cull( cullType_t::CT_TWO_SIDED );
15721572

1573-
if ( glConfig.ssao && r_ssao.Get() == Util::ordinal( ssaoMode::SHOW ) ) {
1573+
if ( glConfig.SSAO && r_SSAO.Get() == Util::ordinal( ssaoMode::SHOW ) ) {
15741574
// clear the screen to show only SSAO
15751575
GL_ClearColor( 1.0, 1.0, 1.0, 1.0 );
15761576
glClear( GL_COLOR_BUFFER_BIT );

src/engine/renderer/tr_init.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Cvar::Cvar<int> r_rendererAPI( "r_rendererAPI", "Renderer API: 0: OpenGL, 1: Vul
299299

300300
Cvar::Range<Cvar::Cvar<int>> r_MSAA( "r_MSAA", "Amount of MSAA samples. 0 to disable", Cvar::NONE, 0, 0, 64 );
301301

302-
Cvar::Range<Cvar::Cvar<int>> r_ssao( "r_ssao",
302+
Cvar::Range<Cvar::Cvar<int>> r_SSAO( "r_SSAO",
303303
"Screen space ambient occlusion: "
304304
"-1: show, 0: disabled, 1: enabled",
305305
Cvar::NONE,
@@ -1217,7 +1217,7 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
12171217
r_printShaders = Cvar_Get( "r_printShaders", "0", 0 );
12181218

12191219
Cvar::Latch( r_bloom );
1220-
Cvar::Latch( r_ssao );
1220+
Cvar::Latch( r_SSAO );
12211221

12221222
Cvar::Latch( r_showLuma );
12231223

src/engine/renderer/tr_local.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2781,7 +2781,7 @@ enum
27812781
extern Cvar::Cvar<bool> r_bloom;
27822782
extern Cvar::Cvar<float> r_bloomBlur;
27832783
extern Cvar::Cvar<int> r_bloomPasses;
2784-
extern Cvar::Range<Cvar::Cvar<int>> r_ssao;
2784+
extern Cvar::Range<Cvar::Cvar<int>> r_SSAO;
27852785

27862786
extern Cvar::Cvar<bool> r_showLuma;
27872787

src/engine/renderer/tr_shade.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static void EnableAvailableFeatures()
135135

136136
glConfig.bloom = r_bloom.Get();
137137

138-
glConfig.ssao = r_ssao.Get() != Util::ordinal( ssaoMode::DISABLED );
138+
glConfig.SSAO = r_SSAO.Get() != Util::ordinal( ssaoMode::DISABLED );
139139

140140
static const std::pair<bool*, std::string> ssaoRequiredExtensions[] = {
141141
{ &glConfig.textureGatherAvailable, "ARB_texture_gather" },
@@ -147,7 +147,7 @@ static void EnableAvailableFeatures()
147147
if ( !*e.first )
148148
{
149149
Log::Warn( "SSAO disabled because %s is not available.", e.second );
150-
glConfig.ssao = false;
150+
glConfig.SSAO = false;
151151
}
152152
}
153153

@@ -378,7 +378,7 @@ static void GLSL_InitGPUShadersOrError()
378378
gl_motionblurShader->MarkProgramForBuilding();
379379
}
380380

381-
if ( glConfig.ssao )
381+
if ( glConfig.SSAO )
382382
{
383383
gl_shaderManager.LoadShader( gl_ssaoShader );
384384

0 commit comments

Comments
 (0)