diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-02-24 11:41:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-24 11:41:04 -0800 |
| commit | 5aa568f3a206d027894ad1edf1d1025136207bc2 (patch) | |
| tree | 6efd659b40251b5170e81e8f3fe549a7d3c78382 /indra/newview/llviewershadermgr.cpp | |
| parent | 63ae47d8fd479a3cb05ff1d2364d683975e1b052 (diff) | |
| parent | a7ecfc9b1907d6ecd5fe50aeb1c41e38540b2665 (diff) | |
Merge pull request #89 from secondlife/SL-19228
SL-19228: Fix GLTF texture transform rotation + add UV debug
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index bddce2d6d9..584dc5c344 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -654,6 +654,7 @@ std::string LLViewerShaderMgr::loadBasicShaders() shaders.push_back( make_pair( "environment/srgbF.glsl", 1 ) ); shaders.push_back( make_pair( "avatar/avatarSkinV.glsl", 1 ) ); shaders.push_back( make_pair( "avatar/objectSkinV.glsl", 1 ) ); + shaders.push_back( make_pair( "deferred/textureUtilV.glsl", 1 ) ); if (gGLManager.mGLSLVersionMajor >= 2 || gGLManager.mGLSLVersionMinor >= 30) { shaders.push_back( make_pair( "objects/indexedTextureV.glsl", 1 ) ); @@ -1320,6 +1321,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred() gDeferredPBROpaqueProgram.mShaderFiles.push_back(make_pair("deferred/pbropaqueV.glsl", GL_VERTEX_SHADER)); gDeferredPBROpaqueProgram.mShaderFiles.push_back(make_pair("deferred/pbropaqueF.glsl", GL_FRAGMENT_SHADER)); gDeferredPBROpaqueProgram.mShaderLevel = mShaderLevel[SHADER_DEFERRED]; + gDeferredPBROpaqueProgram.clearPermutations(); success = make_rigged_variant(gDeferredPBROpaqueProgram, gDeferredSkinnedPBROpaqueProgram); if (success) |