diff options
Diffstat (limited to 'indra/llrender/llrender.h')
| -rw-r--r-- | indra/llrender/llrender.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 0801c12fb4..4bfc5723ee 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -46,7 +46,9 @@ #include <boost/align/aligned_allocator.hpp> #include <array> +#include <chrono> #include <list> +#include <vector> class LLVertexBuffer; class LLCubeMap; @@ -235,8 +237,6 @@ protected: bool mHasMipMaps; void debugTextureUnit(void); - GLint getTextureSource(eTextureBlendSrc src); - GLint getTextureSourceType(eTextureBlendSrc src, bool isAlpha = false); }; class LLLightState @@ -467,6 +467,8 @@ public: LLLightState* getLight(U32 index); void setAmbientLightColor(const LLColor4& color); + void setLineWidth(F32 width); + LLTexUnit* getTexUnit(U32 index); U32 getCurrentTexUnitIndex(void) const { return mCurrTextureUnitIndex; } @@ -487,6 +489,7 @@ public: public: static U32 sUICalls; static U32 sUIVerts; + static F32 sAnisotropicFilteringLevel; static bool sGLCoreProfile; static bool sNsightDebugSupport; static LLVector2 sUIGLScaleFactor; @@ -512,7 +515,8 @@ private: U32 mCount; U32 mMode; U32 mCurrTextureUnitIndex; - bool mCurrColorMask[4]; + bool mCurrColorMask[4]; + F32 mLineWidth = 1.f; LLPointer<LLVertexBuffer> mBuffer; LLStrider<LLVector4a> mVerticesp; @@ -529,6 +533,15 @@ private: std::vector<LLVector4a, boost::alignment::aligned_allocator<LLVector4a, 16> > mUIOffset; std::vector<LLVector4a, boost::alignment::aligned_allocator<LLVector4a, 16> > mUIScale; + + struct LLVBCache + { + LLPointer<LLVertexBuffer> vb; + std::chrono::steady_clock::time_point touched; + }; + + std::unordered_map<U64, LLVBCache> mVBCache; + std::list<LLVertexBufferData>* mBufferDataList = nullptr; }; extern F32 gGLModelView[16]; |