From 527e0018edbe8f660bcfee1960937ace6894b404 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+git@gmail.com>
Date: Fri, 13 May 2011 15:28:39 -0400
Subject: [PATCH] use guGetUniformLocations()

---
 lighting/test.cc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lighting/test.cc b/lighting/test.cc
index 5a993fd..9a38043 100644
--- a/lighting/test.cc
+++ b/lighting/test.cc
@@ -176,12 +176,16 @@ bool init(int width, int height)
         return false;
     }
 
-    ambient_loc = glGetUniformLocation(program, "ambient");
-    diffuse_loc = glGetUniformLocation(program, "diffuse");
-    specular_loc = glGetUniformLocation(program, "specular");
-    shininess_loc = glGetUniformLocation(program, "shininess");
-    projection_loc = glGetUniformLocation(program, "projection");
-    modelview_loc = glGetUniformLocation(program, "modelview");
+    guUniformLocation locs[] = {
+        {&ambient_loc, "ambient"},
+        {&diffuse_loc, "diffuse"},
+        {&specular_loc, "specular"},
+        {&shininess_loc, "shininess"},
+        {&projection_loc, "projection"},
+        {&modelview_loc, "modelview"},
+        {NULL, NULL}
+    };
+    guGetUniformLocations(program, locs);
 
     glUseProgram(program);
     glUniform4f(ambient_loc, 0.2, 0.2, 0.2, 1.0);