Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-01-31 03:55:57 -05:00
parent 655365247c d15ed9ed34
commit 3548521bef
2 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llrender/llvertexbuffer.cpp
View File

@@ -753,16 +753,15 @@ S32 LLVertexBuffer::determineUsage(S32 usage)
if (LLRender::sGLCoreProfile) if (LLRender::sGLCoreProfile)
{ //MUST use VBOs for all rendering { //MUST use VBOs for all rendering
if(!usage) if(!usage)
usage = GL_STREAM_DRAW_ARB; return GL_STREAM_DRAW_ARB;
} }
else if (!sEnableVBOs || !usage) else if (!sEnableVBOs || !usage || (!sUseStreamDraw && usage == GL_STREAM_DRAW_ARB))
{ {
return 0; return 0;
} }
//Only stream_draw and dynamic_draw are supported when using VBOs, dynamic draw is the default. //Only stream_draw and dynamic_draw are supported when using VBOs, dynamic draw is the default.
//Always use stream_draw VBO if mapping is disabled, or stream is enabled and preferred/expected //Always use stream_draw VBO if mapping is disabled, or stream is preferred or expected
if( sDisableVBOMapping || (sUseStreamDraw && (sPreferStreamDraw || usage == GL_STREAM_DRAW_ARB))) if( sDisableVBOMapping || sPreferStreamDraw || (usage == GL_STREAM_DRAW_ARB))
{ {
return GL_STREAM_DRAW_ARB; return GL_STREAM_DRAW_ARB;
} }

11
indra/newview/app_settings/settings.xml
View File

@@ -11379,17 +11379,6 @@
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map>
<key>RenderUseStreamVBO</key>
<map>
<key>Comment</key>
<string>Use VBO's for stream buffers</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map> </map>
<key>RenderPreferStreamDraw</key> <key>RenderPreferStreamDraw</key>
<map> <map>