Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
8f9edd38
Commit
8f9edd38
authored
14 years ago
by
David Parks
Browse files
Options
Downloads
Patches
Plain Diff
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
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/newview/featuretable.txt
+5
-1
5 additions, 1 deletion
indra/newview/featuretable.txt
indra/newview/featuretable_xp.txt
+4
-1
4 additions, 1 deletion
indra/newview/featuretable_xp.txt
indra/newview/llfeaturemanager.cpp
+4
-0
4 additions, 0 deletions
indra/newview/llfeaturemanager.cpp
with
13 additions
and
2 deletions
indra/newview/featuretable.txt
+
5
−
1
View file @
8f9edd38
version 2
5
version 2
6
// 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
This diff is collapsed.
Click to expand it.
indra/newview/featuretable_xp.txt
+
4
−
1
View file @
8f9edd38
version 2
5
version 2
6
// 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
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfeaturemanager.cpp
+
4
−
0
View file @
8f9edd38
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment