diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 1e1d7d4ffe3f4ba7be5b38cd94345397b448ef1d..877823ba82f10ba566e4e4f6664f79337d3f0323 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2886,8 +2886,17 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() // These shaders are non-critical and do not fail shader load if (success) { + { + gDeferredPostDLSProgram.mName = "DLS Shader"; + gDeferredPostDLSProgram.mFeatures.hasSrgb = true; + gDeferredPostDLSProgram.mShaderFiles.clear(); + gDeferredPostDLSProgram.mShaderFiles.push_back(make_pair("alchemy/postNoTCV.glsl", GL_VERTEX_SHADER)); + gDeferredPostDLSProgram.mShaderFiles.push_back(make_pair("alchemy/DLSF.glsl", GL_FRAGMENT_SHADER)); + gDeferredPostDLSProgram.mShaderLevel = mShaderLevel[SHADER_DEFERRED]; + gDeferredPostDLSProgram.createShader(NULL, NULL); + } + // [RLVa:KB] - @setsphere - if (success) { gRlvSphereProgram.mName = "RLVa Sphere Post Processing Shader"; gRlvSphereProgram.mFeatures.isDeferred = true; @@ -2898,21 +2907,10 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() else gRlvSphereProgram.mShaderFiles.push_back(make_pair("deferred/rlvFLegacy.glsl", GL_FRAGMENT_SHADER)); gRlvSphereProgram.mShaderLevel = mShaderLevel[SHADER_DEFERRED]; - success = gRlvSphereProgram.createShader(NULL, NULL); + gRlvSphereProgram.createShader(NULL, NULL); } // [/RLV:KB] - if (success) - { - gDeferredPostDLSProgram.mName = "DLS Shader"; - gDeferredPostDLSProgram.mFeatures.hasSrgb = true; - gDeferredPostDLSProgram.mShaderFiles.clear(); - gDeferredPostDLSProgram.mShaderFiles.push_back(make_pair("alchemy/postNoTCV.glsl", GL_VERTEX_SHADER)); - gDeferredPostDLSProgram.mShaderFiles.push_back(make_pair("alchemy/DLSF.glsl", GL_FRAGMENT_SHADER)); - gDeferredPostDLSProgram.mShaderLevel = mShaderLevel[SHADER_DEFERRED]; - success = gDeferredPostDLSProgram.createShader(NULL, NULL); - } - if (gGLManager.mGLVersion >= 4.59f) { gDeferredPostCASProgram.mName = "Contrast Adaptive Sharpen Shader";