From abdc99f21b542c4fea67030ddbd7166c9d1c6c63 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 18 Feb 2009 21:10:16 +0000
Subject: Merge of QAR-1267 to trunk.  This was a combo merge of QAR-1175
 (maint-render-9) and QAR-1236 (dll-msvcrt-2)

svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
---
 indra/llrender/llvertexbuffer.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'indra/llrender/llvertexbuffer.h')

diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h
index fbddd9d887..aad948e17f 100644
--- a/indra/llrender/llvertexbuffer.h
+++ b/indra/llrender/llvertexbuffer.h
@@ -100,8 +100,10 @@ public:
 	enum {
 		TYPE_VERTEX,
 		TYPE_NORMAL,
-		TYPE_TEXCOORD,
+		TYPE_TEXCOORD0,
+		TYPE_TEXCOORD1,
 		TYPE_TEXCOORD2,
+		TYPE_TEXCOORD3,
 		TYPE_COLOR,
 		// These use VertexAttribPointer and should possibly be made generic
 		TYPE_BINORMAL,
@@ -113,16 +115,15 @@ public:
 	enum {
 		MAP_VERTEX = (1<<TYPE_VERTEX),
 		MAP_NORMAL = (1<<TYPE_NORMAL),
-		MAP_TEXCOORD = (1<<TYPE_TEXCOORD),
+		MAP_TEXCOORD0 = (1<<TYPE_TEXCOORD0),
+		MAP_TEXCOORD1 = (1<<TYPE_TEXCOORD1),
 		MAP_TEXCOORD2 = (1<<TYPE_TEXCOORD2),
+		MAP_TEXCOORD3 = (1<<TYPE_TEXCOORD3),
 		MAP_COLOR = (1<<TYPE_COLOR),
 		// These use VertexAttribPointer and should possibly be made generic
 		MAP_BINORMAL = (1<<TYPE_BINORMAL),
 		MAP_WEIGHT = (1<<TYPE_WEIGHT),
 		MAP_CLOTHWEIGHT = (1<<TYPE_CLOTHWEIGHT),
-		MAP_DRAW = 0x2000, // Buffer is in draw (read-only) mode
-		MAP_MAPPED = 0x4000, // Indicates that buffer has been mapped, but not to any type of data
-		MAP_UNMAPPED = 0x8000 // Indicates that buffer has been logically un-mapped
 	};
 	
 protected:
@@ -165,8 +166,8 @@ public:
 	//   vb->unmapBuffer();
 	bool getVertexStrider(LLStrider<LLVector3>& strider, S32 index=0);
 	bool getIndexStrider(LLStrider<U16>& strider, S32 index=0);
-	bool getTexCoordStrider(LLStrider<LLVector2>& strider, S32 index=0);
-	bool getTexCoord2Strider(LLStrider<LLVector2>& strider, S32 index=0);
+	bool getTexCoord0Strider(LLStrider<LLVector2>& strider, S32 index=0);
+	bool getTexCoord1Strider(LLStrider<LLVector2>& strider, S32 index=0);
 	bool getNormalStrider(LLStrider<LLVector3>& strider, S32 index=0);
 	bool getBinormalStrider(LLStrider<LLVector3>& strider, S32 index=0);
 	bool getColorStrider(LLStrider<LLColor4U>& strider, S32 index=0);
-- 
cgit v1.2.3