diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
| commit | a4913246770b58ed569021c484c213231aaae549 (patch) | |
| tree | 0878deeaa86b2c3a28cbf325566e8489111523c1 /indra/newview/llvovolume.cpp | |
| parent | 80c2abddcfbcb578e70d220baa95aebdee3d529c (diff) | |
| parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) | |
merge up to latest viewer-release
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 438d578ac5..e7c35d8220 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4714,11 +4714,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: buffer_index = -1; } - S32 texture_index_channels = LLGLSLShader::sIndexedTextureChannels-1; //always reserve one for shiny for now just for simplicity + S32 texture_index_channels = 1; - if (gGLManager.mGLVersion < 3.1f) + if (gGLManager.mGLSLVersionMajor > 1 || gGLManager.mGLSLVersionMinor >= 30) { - texture_index_channels = 1; + texture_index_channels = LLGLSLShader::sIndexedTextureChannels-1; //always reserve one for shiny for now just for simplicity; } if (LLPipeline::sRenderDeferred && distance_sort) |