diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-06-03 16:24:07 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-06-03 16:24:07 -0700 |
| commit | ffab1eef57813625cae51bffd8dd830371b2e203 (patch) | |
| tree | 2312038b2d728901d70c7a26f995b6eb04e4f411 /indra/llrender/llvertexbuffer.cpp | |
| parent | b77e027fcc09937f1d87f02025866a42afa51e39 (diff) | |
Mac build fixes.
Reviewed by davep.
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 74fd3bf197..3197866fa9 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1017,6 +1017,7 @@ U8* LLVertexBuffer::mapVertexBuffer(S32 type, S32 index, S32 count, bool map_ran else { U8* src = NULL; +#ifdef GL_ARB_map_buffer_range if (gGLManager.mHasMapBufferRange) { if (map_range) @@ -1031,6 +1032,9 @@ U8* LLVertexBuffer::mapVertexBuffer(S32 type, S32 index, S32 count, bool map_ran } } else +#else + llassert_always(!gGLManager.mHasMapBufferRange); +#endif { map_range = false; src = (U8*) glMapBufferARB(GL_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB); @@ -1156,6 +1160,7 @@ U8* LLVertexBuffer::mapIndexBuffer(S32 index, S32 count, bool map_range) else { U8* src = NULL; +#ifdef GL_ARB_map_buffer_range if (gGLManager.mHasMapBufferRange) { if (map_range) @@ -1170,6 +1175,9 @@ U8* LLVertexBuffer::mapIndexBuffer(S32 index, S32 count, bool map_range) } } else +#else + llassert_always(!gGLManager.mHasMapBufferRange); +#endif { map_range = false; src = (U8*) glMapBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, GL_WRITE_ONLY_ARB); @@ -1241,6 +1249,7 @@ void LLVertexBuffer::unmapBuffer(S32 type) } else { +#ifdef GL_ARB_map_buffer_range if (gGLManager.mHasMapBufferRange) { if (!mMappedVertexRegions.empty()) @@ -1258,6 +1267,9 @@ void LLVertexBuffer::unmapBuffer(S32 type) mMappedVertexRegions.clear(); } } +#else + llassert_always(!gGLManager.mHasMapBufferRange); +#endif stop_glerror(); glUnmapBufferARB(GL_ARRAY_BUFFER_ARB); stop_glerror(); @@ -1279,7 +1291,7 @@ void LLVertexBuffer::unmapBuffer(S32 type) } else { - +#ifdef GL_ARB_map_buffer_range if (gGLManager.mHasMapBufferRange) { if (!mMappedIndexRegions.empty()) @@ -1296,6 +1308,9 @@ void LLVertexBuffer::unmapBuffer(S32 type) mMappedIndexRegions.clear(); } } +#else + llassert_always(!gGLManager.mHasMapBufferRange); +#endif stop_glerror(); glUnmapBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB); stop_glerror(); |