From d7ad5a35d69072d773feccc875d9528e112b6283 Mon Sep 17 00:00:00 2001
From: dev <sam@highfidelity.io>
Date: Tue, 13 Jan 2015 18:24:32 -0800
Subject: [PATCH] fixes for glsl mac

---
 libraries/gpu/src/gpu/GLBackend.cpp     |  8 ++++----
 libraries/render-utils/src/Material.slh | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/libraries/gpu/src/gpu/GLBackend.cpp b/libraries/gpu/src/gpu/GLBackend.cpp
index f5f998d0d9..ed1b97a58f 100644
--- a/libraries/gpu/src/gpu/GLBackend.cpp
+++ b/libraries/gpu/src/gpu/GLBackend.cpp
@@ -494,13 +494,13 @@ void GLBackend::do_setUniformBuffer(Batch& batch, uint32 paramOffset) {
 #if defined(Q_OS_MAC)
     GLfloat* data = (GLfloat*) (uniformBuffer->getData() + rangeStart);
     glUniform4fv(slot, rangeSize / sizeof(GLfloat[4]), data);
+ 
+    // NOT working so we ll stick to the uniform float array until we move to core profile
+    // GLuint bo = getBufferID(*uniformBuffer);
+    //glUniformBufferEXT(_shader._program, slot, bo);
 #else
     GLuint bo = getBufferID(*uniformBuffer);
     glBindBufferRange(GL_UNIFORM_BUFFER, slot, bo, rangeStart, rangeSize);
-
-   // glUniformBufferEXT(_shader._program, slot, bo);
-
-    //glBindBufferBase(GL_UNIFORM_BUFFER, slot, bo);
 #endif
     CHECK_GL_ERROR();
 }
diff --git a/libraries/render-utils/src/Material.slh b/libraries/render-utils/src/Material.slh
index 2ea7b2a12c..e77b664ee1 100755
--- a/libraries/render-utils/src/Material.slh
+++ b/libraries/render-utils/src/Material.slh
@@ -36,8 +36,17 @@ Material getMaterial() {
     Material mat;
     mat._diffuse = materialBuffer[0];
     mat._specular = materialBuffer[1];
-    return mat;    
+    return mat;
 }
+<!/* tryed and failed...
+   bindable uniform struct {
+   Material mat;
+   } materialBuffer;
+   
+   Material getMaterial() {
+   return materialBuffer.mat;
+   }
+   */!>
 <@else@>
 uniform vec4 materialBuffer[2];
 Material getMaterial() {
@@ -48,14 +57,6 @@ Material getMaterial() {
 }
 <@endif@>
 
-<!/*
-bindable uniform struct {
-    Material mat;
-} materialBuffer;
 
-Material getMaterial() {
-    return materialBuffer.mat;    
-}
-*/!>
 
 <@endif@>
\ No newline at end of file