diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-05-30 14:55:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-05-30 14:55:34 -0500 |
| commit | 67221663fe46a29daf05e1e19282ad2228908991 (patch) | |
| tree | bd5ceb5195ac417573b9e07442ff52bd841ee6d7 /indra | |
| parent | 2207b979ebb4f453fdda721710a7cc1b71df55b2 (diff) | |
MAINT-616 Fix for mac build.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 149e8cc548..7cbf39096e 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -174,10 +174,12 @@ BOOL LLGLSLShader::createShader(vector<string> * attributes, mFeatures.mIndexedTextureChannels = llmin(mFeatures.mIndexedTextureChannels, 1); } +#ifdef GL_INTERLEAVED_ATTRIBS if (varying_count > 0 && varyings) { glTransformFeedbackVaryings(mProgramObject, varying_count, varyings, GL_INTERLEAVED_ATTRIBS); } +#endif // Map attributes and uniforms if (success) diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 2e7c8a0e8f..0092df6587 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -373,7 +373,9 @@ U32 LLVertexBuffer::getVAOName() } else { +#ifdef GL_ARB_vertex_array_object glGenVertexArrays(1, &ret); +#endif } return ret; @@ -2161,9 +2163,11 @@ void LLVertexBuffer::flush() // bind for transform feedback (quick 'n dirty) void LLVertexBuffer::bindForFeedback(U32 channel, U32 type, U32 index, U32 count) { +#ifdef GL_TRANSFORM_FEEDBACK_BUFFER U32 offset = mOffsets[type] + sTypeSize[type]*index; U32 size= (sTypeSize[type]*count); glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, channel, mGLBuffer, offset, size); +#endif } // Set for rendering |