From 67221663fe46a29daf05e1e19282ad2228908991 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 30 May 2012 14:55:34 -0500
Subject: MAINT-616 Fix for mac build.

---
 indra/llrender/llglslshader.cpp   | 2 ++
 indra/llrender/llvertexbuffer.cpp | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'indra')

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
-- 
cgit v1.2.3