aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llvertexbuffer.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llrender/llvertexbuffer.h')
-rw-r--r--linden/indra/llrender/llvertexbuffer.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/linden/indra/llrender/llvertexbuffer.h b/linden/indra/llrender/llvertexbuffer.h
index 8edcf69..aa1aafc 100644
--- a/linden/indra/llrender/llvertexbuffer.h
+++ b/linden/indra/llrender/llvertexbuffer.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2003&license=viewergpl$ 5 * $LicenseInfo:firstyear=2003&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2003-2008, Linden Research, Inc. 7 * Copyright (c) 2003-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -39,6 +39,7 @@
39#include "v4coloru.h" 39#include "v4coloru.h"
40#include "llstrider.h" 40#include "llstrider.h"
41#include "llmemory.h" 41#include "llmemory.h"
42#include "llrender.h"
42#include <set> 43#include <set>
43#include <vector> 44#include <vector>
44#include <list> 45#include <list>
@@ -123,19 +124,8 @@ public:
123 MAP_UNMAPPED = 0x8000 // Indicates that buffer has been logically un-mapped 124 MAP_UNMAPPED = 0x8000 // Indicates that buffer has been logically un-mapped
124 }; 125 };
125 126
126 enum {
127 TRIANGLES = 0,
128 TRIANGLE_STRIP,
129 TRIANGLE_FAN,
130 POINTS,
131 LINES,
132 LINE_STRIP,
133 QUADS,
134 LINE_LOOP,
135 NUM_MODES
136 };
137protected: 127protected:
138 friend class LLGLImmediate; 128 friend class LLRender;
139 129
140 virtual ~LLVertexBuffer(); // use unref() 130 virtual ~LLVertexBuffer(); // use unref()
141 131
@@ -255,7 +245,7 @@ public:
255 245
256 static BOOL sEnableVBOs; 246 static BOOL sEnableVBOs;
257 static S32 sTypeOffsets[TYPE_MAX]; 247 static S32 sTypeOffsets[TYPE_MAX];
258 static U32 sGLMode[NUM_MODES]; 248 static U32 sGLMode[LLRender::NUM_MODES];
259 static U32 sGLRenderBuffer; 249 static U32 sGLRenderBuffer;
260 static U32 sGLRenderIndices; 250 static U32 sGLRenderIndices;
261 static BOOL sVBOActive; 251 static BOOL sVBOActive;