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, 16 insertions, 6 deletions

diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index 24875f0d21..bb74d258fd 100644
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -135,10 +135,6 @@ public:
 	S32  setMaterialID(const LLMaterialID& pMaterialID);
 	S32  setMaterialParams(const LLMaterialPtr pMaterialParams);
 	
-    void setGLTFMaterial(LLGLTFMaterial* material) { mGLTFMaterial = material; }
-    LLGLTFMaterial* getGLTFMaterial() { return mGLTFMaterial; }
-
-
 	virtual const LLUUID &getID() const { return mID; }
 	const LLColor4 &getColor() const { return mColor; }
     const F32 getAlpha() const { return mColor.mV[VALPHA]; }
@@ -200,10 +196,18 @@ public:
 	// Media flags
 	enum { MF_NONE = 0x0, MF_HAS_MEDIA = 0x1 };
 
+    // GLTF asset
+    void setGLTFMaterial(LLGLTFMaterial* material) { mGLTFMaterial = material; }
+    LLGLTFMaterial* getGLTFMaterial() { return mGLTFMaterial; }
+
     // GLTF override
     LLGLTFMaterial* getGLTFMaterialOverride() { return mGLTFMaterialOverrides; }
     void setGLTFMaterialOverride(LLGLTFMaterial* mat) { mGLTFMaterialOverrides = mat; }
 
+    // GLTF render
+    LLGLTFMaterial* getGLTFRenderMaterial() { return mGLTFRenderMaterial; }
+    void setGLTFRenderMaterial(LLGLTFMaterial* mat) { mGLTFRenderMaterial = mat; }
+
 public:
 	F32                 mScaleS;                // S, T offset
 	F32                 mScaleT;                // S, T offset
@@ -230,12 +234,18 @@ protected:
 	bool                mMaterialUpdatePending;
 	LLMaterialID        mMaterialID;
 	LLMaterialPtr		mMaterial;
-    LLPointer<LLGLTFMaterial> mGLTFMaterial;  // if present, ignore mMaterial
+    
+    // Reference to GLTF material asset state
+    // On the viewer, this should be the same LLGLTFMaterial instance that exists in LLGLTFMaterialList
+    LLPointer<LLGLTFMaterial> mGLTFMaterial;  
 
     // GLTF material parameter overrides -- the viewer will use this data to override material parameters
-    // set by the asset
+    // set by the asset and store the results in mRenderGLTFMaterial
     LLPointer<LLGLTFMaterial> mGLTFMaterialOverrides;
 
+    // GLTF material to use for rendering -- will always be an LLFetchedGLTFMaterial
+    LLPointer<LLGLTFMaterial> mGLTFRenderMaterial; 
+
 	// Note the media data is not sent via the same message structure as the rest of the TE
 	LLMediaEntry*		mMediaEntry;			// The media data for the face