SL-18105 Hook up render pipe directly to LLTextureEntry::mGLTFMaterial and add LLViewerFetchedTextures to LLFetchedGLTFMaterial. Lower reflection probe resolution to 128x128 per side.

1 files changed, 17 insertions, 6 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 0c27296440..cb54cec165 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3723,15 +3723,26 @@ void LLPipeline::touchTexture(LLViewerTexture* tex, F32 vsize)
 void LLPipeline::touchTextures(LLDrawInfo* info)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE;
-    for (int i = 0; i < info->mTextureList.size(); ++i)
+
+    auto& mat = info->mGLTFMaterial;
+    if (mat.notNull())
     {
-        touchTexture(info->mTextureList[i], info->mTextureListVSize[i]);
+        touchTexture(mat->mBaseColorTexture, info->mVSize);
+        touchTexture(mat->mNormalTexture, info->mVSize);
+        touchTexture(mat->mMetallicRoughnessTexture, info->mVSize);
+        touchTexture(mat->mEmissiveTexture, info->mVSize);
     }
+    else
+    {
+        for (int i = 0; i < info->mTextureList.size(); ++i)
+        {
+            touchTexture(info->mTextureList[i], info->mTextureListVSize[i]);
+        }
 
-    touchTexture(info->mTexture, info->mVSize);
-    touchTexture(info->mSpecularMap, info->mVSize);
-    touchTexture(info->mNormalMap, info->mVSize);
-    touchTexture(info->mEmissiveMap, info->mVSize);
+        touchTexture(info->mTexture, info->mVSize);
+        touchTexture(info->mSpecularMap, info->mVSize);
+        touchTexture(info->mNormalMap, info->mVSize);
+    }
 }
 
 void LLPipeline::postSort(LLCamera& camera)