davep avatar davep committed e6492b1

MAINT-616 Fix for mac build.

Comments (0)

Files changed (2)

indra/llrender/llglslshader.cpp

 		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)

indra/llrender/llvertexbuffer.cpp

 	}
 	else
 	{
+#ifdef GL_ARB_vertex_array_object
 		glGenVertexArrays(1, &ret);
+#endif
 	}
 
 	return ret;		
 // 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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.