1 files changed, 24 insertions, 2 deletions

diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h
index b634609929..49500e28ce 100644
--- a/indra/llrender/llvertexbuffer.h
+++ b/indra/llrender/llvertexbuffer.h
@@ -110,6 +110,7 @@ public:
         TYPE_WEIGHT,            //  "weight"
         TYPE_WEIGHT4,           //  "weight4"
         TYPE_CLOTHWEIGHT,       //  "clothing"
+        TYPE_JOINT,             //  "joint"
         TYPE_TEXTURE_INDEX,     //  "texture_index"
         TYPE_MAX,   // TYPE_MAX is the size/boundary marker for attributes that go in the vertex buffer
         TYPE_INDEX, // TYPE_INDEX is beyond _MAX because it lives in a separate (index) buffer
@@ -129,6 +130,7 @@ public:
         MAP_WEIGHT = (1<<TYPE_WEIGHT),
         MAP_WEIGHT4 = (1<<TYPE_WEIGHT4),
         MAP_CLOTHWEIGHT = (1<<TYPE_CLOTHWEIGHT),
+        MAP_JOINT = (1<<TYPE_JOINT),
         MAP_TEXTURE_INDEX = (1<<TYPE_TEXTURE_INDEX),
     };
 
@@ -193,11 +195,25 @@ public:
     void setNormalData(const LLVector4a* data);
     void setTangentData(const LLVector4a* data);
     void setWeight4Data(const LLVector4a* data);
-    void setTexCoordData(const LLVector2* data);
+    void setJointData(const U64* data);
+    void setTexCoord0Data(const LLVector2* data);
+    void setTexCoord1Data(const LLVector2* data);
     void setColorData(const LLColor4U* data);
     void setIndexData(const U16* data);
     void setIndexData(const U32* data);
 
+    void setPositionData(const LLVector4a* data, U32 offset, U32 count);
+    void setNormalData(const LLVector4a* data, U32 offset, U32 count);
+    void setTangentData(const LLVector4a* data, U32 offset, U32 count);
+    void setWeight4Data(const LLVector4a* data, U32 offset, U32 count);
+    void setJointData(const U64* data, U32 offset, U32 count);
+    void setTexCoord0Data(const LLVector2* data, U32 offset, U32 count);
+    void setTexCoord1Data(const LLVector2* data, U32 offset, U32 count);
+    void setColorData(const LLColor4U* data, U32 offset, U32 count);
+    void setIndexData(const U16* data, U32 offset, U32 count);
+    void setIndexData(const U32* data, U32 offset, U32 count);
+
+
     U32 getNumVerts() const                 { return mNumVerts; }
     U32 getNumIndices() const               { return mNumIndices; }
 
@@ -215,6 +231,10 @@ public:
     void drawArrays(U32 mode, U32 offset, U32 count) const;
     void drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indices_offset) const;
 
+    // draw without syncing matrices.  If you're positive there have been no matrix
+    // since the last call to syncMatrices, this is much faster than drawRange
+    void drawRangeFast(U32 mode, U32 start, U32 end, U32 count, U32 indices_offset) const;
+
     //for debugging, validate data in given range is valid
     bool validateRange(U32 start, U32 end, U32 count, U32 offset) const;
 
@@ -252,11 +272,13 @@ private:
     friend class LLNavShapeVBOManager;
     friend class LLNavMeshVBOManager;
 
+    void flush_vbo(GLenum target, U32 start, U32 end, void* data, U8* dst);
+
     LLVertexBuffer(U32 typemask, U32 usage)
         : LLVertexBuffer(typemask)
     {}
 
-    bool    allocateBuffer(S32 nverts, S32 nindices, BOOL create) { return allocateBuffer(nverts, nindices); }
+    bool    allocateBuffer(S32 nverts, S32 nindices, bool create) { return allocateBuffer(nverts, nindices); }
 
 public: