Skip to content
Snippets Groups Projects
Commit 8f9edd38 authored by David Parks's avatar David Parks
Browse files

SH-534 Don't allow deferred rendering to be enabled on windows PC's with GL version less than 3.0.

parent b30bf985
No related branches found
No related tags found
No related merge requests found
version 25 version 26
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table // Should be combined into one table
...@@ -275,6 +275,9 @@ RenderObjectBump 0 0 ...@@ -275,6 +275,9 @@ RenderObjectBump 0 0
list OpenGLPre15 list OpenGLPre15
RenderVBOEnable 1 0 RenderVBOEnable 1 0
list OpenGLPre30
RenderDeferred 0 0
list Intel list Intel
RenderAnisotropic 1 0 RenderAnisotropic 1 0
...@@ -561,3 +564,4 @@ list NVIDIA_GeForce_Go_7800 ...@@ -561,3 +564,4 @@ list NVIDIA_GeForce_Go_7800
RenderShaderLightingMaxLevel 1 2 RenderShaderLightingMaxLevel 1 2
list NVIDIA_GeForce_Go_7900 list NVIDIA_GeForce_Go_7900
RenderShaderLightingMaxLevel 1 2 RenderShaderLightingMaxLevel 1 2
version 25 version 26
// NOTE: This is mostly identical to featuretable_mac.txt with a few differences // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
// Should be combined into one table // Should be combined into one table
...@@ -267,6 +267,9 @@ RenderObjectBump 0 0 ...@@ -267,6 +267,9 @@ RenderObjectBump 0 0
list OpenGLPre15 list OpenGLPre15
RenderVBOEnable 1 0 RenderVBOEnable 1 0
list OpenGLPre30
RenderDeferred 0 0
list Intel list Intel
RenderAnisotropic 1 0 RenderAnisotropic 1 0
......
...@@ -745,6 +745,10 @@ void LLFeatureManager::applyBaseMasks() ...@@ -745,6 +745,10 @@ void LLFeatureManager::applyBaseMasks()
{ {
maskFeatures("OpenGLPre15"); maskFeatures("OpenGLPre15");
} }
if (gGLManager.mGLVersion < 3.f)
{
maskFeatures("OpenGLPre30");
}
// now mask by gpu string // now mask by gpu string
// Replaces ' ' with '_' in mGPUString to deal with inability for parser to handle spaces // Replaces ' ' with '_' in mGPUString to deal with inability for parser to handle spaces
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment