summaryrefslogtreecommitdiff
path: root/indra/llrender/llvertexbuffer.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-23 20:47:55 -0500
committerDave Parks <davep@lindenlab.com>2011-09-23 20:47:55 -0500
commit4f2b20a30dff80756a2efdceceb3651cc05f1aee (patch)
tree7de32176ed1f690de6ad41e1b8dcedf6dc7acf1b /indra/llrender/llvertexbuffer.cpp
parent4821a22070c1f68f224ff670096c2bddf25b932a (diff)
SH-2244 Fix for mac build? (take two)
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
-rw-r--r--indra/llrender/llvertexbuffer.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index add3decee3..422f2a06d6 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -255,13 +255,6 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask)
MAP_TEXCOORD3
};
- U32 type_tc[] =
- {
- TYPE_TEXCOORD1,
- TYPE_TEXCOORD2,
- TYPE_TEXCOORD3
- };
-
for (U32 i = 0; i < 3; i++)
{
if (sLastMask & map_tc[i])
@@ -2221,7 +2214,7 @@ void LLVertexBuffer::setupVertexBuffer(U32 data_mask)
{
S32 loc = TYPE_VERTEX;
void* ptr = (void*)(base + mOffsets[TYPE_VERTEX]);
- glVertexAttribPointerARB(loc, 3,GL_FLOAT, GL_FALSE, LLVertexBuffer::sTypeSize[TYPE_VERTEX], (void*)(base + 0));
+ glVertexAttribPointerARB(loc, 3,GL_FLOAT, GL_FALSE, LLVertexBuffer::sTypeSize[TYPE_VERTEX], ptr);
}
}
else