Skip to content

Commit aeed42b

Browse files
committed
Fix glconfig2 occurences
1 parent cc83d36 commit aeed42b

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/engine/renderer/tr_backend.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ static void RenderDepthTiles()
12281228
}
12291229

12301230
// Assume depth is dirty since we just rendered depth pass
1231-
if ( glConfig2.textureBarrierAvailable ) {
1231+
if ( glConfig.textureBarrierAvailable ) {
12321232
glTextureBarrier();
12331233
backEnd.dirtyDepthBuffer = false;
12341234
}
@@ -1516,7 +1516,7 @@ void RB_RenderMotionBlur()
15161516

15171517
/* Assume depth is dirty since we just rendered depth pass and everything opaque,
15181518
unless we have already rendered post-depth lighttile, which does this as well */
1519-
if ( glConfig2.textureBarrierAvailable && backEnd.dirtyDepthBuffer ) {
1519+
if ( glConfig.textureBarrierAvailable && backEnd.dirtyDepthBuffer ) {
15201520
glTextureBarrier();
15211521
backEnd.dirtyDepthBuffer = false;
15221522
}
@@ -2815,7 +2815,7 @@ static void SetFrameUniforms() {
28152815
globalUBOProxy->SetUniform_ColorModulate( tr.viewParms.gradingWeights );
28162816
globalUBOProxy->SetUniform_InverseGamma( 1.0f / r_gamma->value );
28172817

2818-
const bool tonemap = r_toneMapping.Get() && r_highPrecisionRendering.Get() && glConfig2.textureFloatAvailable;
2818+
const bool tonemap = r_toneMapping.Get() && r_highPrecisionRendering.Get() && glConfig.textureFloatAvailable;
28192819
if ( tonemap ) {
28202820
vec4_t tonemapParms{ r_toneMappingContrast.Get(), r_toneMappingHighlightsCompressionSpeed.Get() };
28212821
ComputeTonemapParams( tonemapParms[0], tonemapParms[1], r_toneMappingHDRMax.Get(),
@@ -2825,7 +2825,7 @@ static void SetFrameUniforms() {
28252825
}
28262826
globalUBOProxy->SetUniform_Tonemap( tonemap );
28272827

2828-
if ( glConfig2.usingMaterialSystem ) {
2828+
if ( glConfig.usingMaterialSystem ) {
28292829
materialSystem.SetFrameUniforms();
28302830
}
28312831

@@ -3833,7 +3833,7 @@ void RB_ExecuteRenderCommands( const void *data )
38333833

38343834
materialSystem.frameStart = true;
38353835

3836-
if ( glConfig2.pushBufferAvailable ) {
3836+
if ( glConfig.pushBufferAvailable ) {
38373837
SetFrameUniforms();
38383838
}
38393839

src/engine/renderer/tr_bsp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4648,8 +4648,8 @@ static void SetConstUniforms() {
46484648

46494649
globalUBOProxy->SetUniform_ProfilerZero();
46504650

4651-
if ( glConfig2.usingBindlessTextures ) {
4652-
if ( glConfig2.colorGrading ) {
4651+
if ( glConfig.usingBindlessTextures ) {
4652+
if ( glConfig.colorGrading ) {
46534653
globalUBOProxy->SetUniform_ColorMap3DBindless( GL_BindToTMU( 3, tr.colorGradeImage ) );
46544654
}
46554655

@@ -4661,7 +4661,7 @@ static void SetConstUniforms() {
46614661
GL_BindToTMU( 0, tr.fogImage )
46624662
);
46634663

4664-
if ( glConfig2.realtimeLighting ) {
4664+
if ( glConfig.realtimeLighting ) {
46654665
globalUBOProxy->SetUniform_DepthTile1Bindless(
46664666
GL_BindToTMU( 0, tr.depthtile1RenderImage )
46674667
);
@@ -4679,7 +4679,7 @@ static void SetConstUniforms() {
46794679
globalUBOProxy->SetUniform_LightGrid2Bindless( GL_BindToTMU( BIND_LIGHTGRID2, tr.lightGrid2Image ) );
46804680
}
46814681

4682-
if ( glConfig2.usingMaterialSystem ) {
4682+
if ( glConfig.usingMaterialSystem ) {
46834683
materialSystem.SetConstUniforms();
46844684
}
46854685

src/engine/renderer/tr_vbo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ void R_InitVBOs()
760760
stagingBuffer.InitGLBuffer();
761761
}
762762

763-
if ( glConfig2.pushBufferAvailable ) {
763+
if ( glConfig.pushBufferAvailable ) {
764764
pushBuffer.InitGLBuffers();
765765
}
766766

@@ -841,7 +841,7 @@ void R_ShutdownVBOs()
841841
stagingBuffer.FreeGLBuffer();
842842
}
843843

844-
if ( glConfig2.pushBufferAvailable ) {
844+
if ( glConfig.pushBufferAvailable ) {
845845
pushBuffer.FreeGLBuffers();
846846
}
847847

0 commit comments

Comments
 (0)