Skip to content

Commit e3df2bd

Browse files
committed
Fix glconfig2 occurences
1 parent 43f6864 commit e3df2bd

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/engine/renderer/tr_backend.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2805,7 +2805,7 @@ static void SetFrameUniforms() {
28052805
globalUBOProxy->SetUniform_ColorModulate( tr.viewParms.gradingWeights );
28062806
globalUBOProxy->SetUniform_InverseGamma( 1.0f / r_gamma->value );
28072807

2808-
const bool tonemap = r_toneMapping.Get() && r_highPrecisionRendering.Get() && glConfig2.textureFloatAvailable;
2808+
const bool tonemap = r_toneMapping.Get() && r_highPrecisionRendering.Get() && glConfig.textureFloatAvailable;
28092809
if ( tonemap ) {
28102810
vec4_t tonemapParms{ r_toneMappingContrast.Get(), r_toneMappingHighlightsCompressionSpeed.Get() };
28112811
ComputeTonemapParams( tonemapParms[0], tonemapParms[1], r_toneMappingHDRMax.Get(),
@@ -2815,7 +2815,7 @@ static void SetFrameUniforms() {
28152815
}
28162816
globalUBOProxy->SetUniform_Tonemap( tonemap );
28172817

2818-
if ( glConfig2.usingMaterialSystem ) {
2818+
if ( glConfig.usingMaterialSystem ) {
28192819
materialSystem.SetFrameUniforms();
28202820
}
28212821

@@ -3823,7 +3823,7 @@ void RB_ExecuteRenderCommands( const void *data )
38233823

38243824
materialSystem.frameStart = true;
38253825

3826-
if ( glConfig2.pushBufferAvailable ) {
3826+
if ( glConfig.pushBufferAvailable ) {
38273827
SetFrameUniforms();
38283828
}
38293829

src/engine/renderer/tr_bsp.cpp

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

46554655
globalUBOProxy->SetUniform_ProfilerZero();
46564656

4657-
if ( glConfig2.usingBindlessTextures ) {
4658-
if ( glConfig2.colorGrading ) {
4657+
if ( glConfig.usingBindlessTextures ) {
4658+
if ( glConfig.colorGrading ) {
46594659
globalUBOProxy->SetUniform_ColorMap3DBindless( GL_BindToTMU( 3, tr.colorGradeImage ) );
46604660
}
46614661

@@ -4667,7 +4667,7 @@ static void SetConstUniforms() {
46674667
GL_BindToTMU( 0, tr.fogImage )
46684668
);
46694669

4670-
if ( glConfig2.realtimeLighting ) {
4670+
if ( glConfig.realtimeLighting ) {
46714671
globalUBOProxy->SetUniform_DepthTile1Bindless(
46724672
GL_BindToTMU( 0, tr.depthtile1RenderImage )
46734673
);
@@ -4685,7 +4685,7 @@ static void SetConstUniforms() {
46854685
globalUBOProxy->SetUniform_LightGrid2Bindless( GL_BindToTMU( BIND_LIGHTGRID2, tr.lightGrid2Image ) );
46864686
}
46874687

4688-
if ( glConfig2.usingMaterialSystem ) {
4688+
if ( glConfig.usingMaterialSystem ) {
46894689
materialSystem.SetConstUniforms();
46904690
}
46914691

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)