From d3edd14638d0be8233ca7970d67beb7bd8ac0064 Mon Sep 17 00:00:00 2001
From: dev <sam@highfidelity.io>
Date: Tue, 13 Jan 2015 16:53:22 -0800
Subject: [PATCH] fixes for glsl mac

---
 libraries/render-utils/src/Material.slh | 10 ++++++----
 libraries/render-utils/src/model.slf    |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libraries/render-utils/src/Material.slh b/libraries/render-utils/src/Material.slh
index 4720b19d00..2ea7b2a12c 100755
--- a/libraries/render-utils/src/Material.slh
+++ b/libraries/render-utils/src/Material.slh
@@ -15,12 +15,14 @@ struct Material {
     vec4 _diffuse;
     vec4 _specular;
 
-    float getOpacity() { return _diffuse.a; }
-    vec3 getDiffuse() { return _diffuse.rgb; }
-    vec3 getSpecular() { return _specular.rgb; }
-    float getShininess() { return _specular.a; }
 };
 
+float getMaterialOpacity(Material m) { return m._diffuse.a; }
+vec3 getMaterialDiffuse(Material m) { return m._diffuse.rgb; }
+vec3 getMaterialSpecular(Material m) { return m._specular.rgb; }
+float getMaterialShininess(Material m) { return m._specular.a; }
+
+
 <@if GLPROFILE == PC_GL@>
 uniform materialBuffer {
     Material mat;
diff --git a/libraries/render-utils/src/model.slf b/libraries/render-utils/src/model.slf
index 396935b4b8..bc6f127a77 100755
--- a/libraries/render-utils/src/model.slf
+++ b/libraries/render-utils/src/model.slf
@@ -29,8 +29,8 @@ void main(void) {
 
     packDeferredFragment(
         normalize(normal.xyz), 
-        evalOpaqueFinalAlpha(mat.getOpacity(), diffuse.a),
-        mat.getDiffuse()/* * diffuse.rgb*/,
-        mat.getSpecular(),
-        mat.getShininess());
+        evalOpaqueFinalAlpha(getMaterialOpacity(mat), diffuse.a),
+        getMaterialDiffuse(mat) * diffuse.rgb,
+        getMaterialSpecular(mat),
+        getMaterialShininess(mat));
 }