Skip to content

Commit 353b2ce

Browse files
committed
Add a GL version check for MSAA
1 parent 2cdcc89 commit 353b2ce

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/engine/renderer/tr_shade.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,16 @@ static void EnableAvailableFeatures()
180180
}
181181
}
182182

183-
glConfig.MSAA = r_msaa.Get();
184-
const int maxSamples = std::min( glConfig.maxColorTextureSamples, glConfig.maxDepthTextureSamples );
185-
if ( glConfig.MSAA > maxSamples ) {
186-
Log::Warn( "MSAA samples %i > %i, setting to %i", r_msaa.Get(), maxSamples, maxSamples );
187-
glConfig.MSAA = maxSamples;
183+
if ( std::make_pair( glConfig.glMajor, glConfig.glMinor ) >= std::make_pair( 3, 2 ) ) {
184+
glConfig.MSAA = r_msaa.Get();
185+
const int maxSamples = std::min( glConfig.maxColorTextureSamples, glConfig.maxDepthTextureSamples );
186+
187+
if ( glConfig.MSAA > maxSamples ) {
188+
Log::Warn( "MSAA samples %i > %i, setting to %i", r_msaa.Get(), maxSamples, maxSamples );
189+
glConfig.MSAA = maxSamples;
190+
}
191+
} else if ( r_msaa.Get() ) {
192+
Log::Warn( "MSAA unavailable because GL version is lower than required (%i.%i < %i.%i)", glConfig.glMajor, glConfig.glMinor, 3, 2 );
188193
}
189194

190195
glConfig.usingMaterialSystem = r_materialSystem.Get() && glConfig.materialSystemAvailable;

0 commit comments

Comments
 (0)