From cc5051e85c6491f54438ee62573953107c916fff Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Thu, 22 May 2014 21:18:01 -0400
Subject: Memoize uniform-location.

* 2d/helpers.scm (memoize): New procedure.

* 2d/shader.scm (uniform-location): memoize.
  (uniform-set!): Pass symbol instead of string.
---
 2d/shader.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to '2d/shader.scm')

diff --git a/2d/shader.scm b/2d/shader.scm
index 0be977f..1ed18bd 100644
--- a/2d/shader.scm
+++ b/2d/shader.scm
@@ -284,9 +284,12 @@ location."
                                          (color-b c)
                                          (color-a c))))
 
-(define (uniform-location shader-program name)
-  "Retrieve the location for the uniform NAME within SHADER-PROGRAM."
-  (glGetUniformLocation (shader-program-id shader-program) name))
+(define uniform-location
+  (memoize
+   (lambda (shader-program name)
+     "Retrieve the location for the uniform NAME within SHADER-PROGRAM."
+     (glGetUniformLocation (shader-program-id shader-program)
+                           (symbol->string name)))))
 
 (define (uniform-set! shader-program name value)
   "Use the appropriate setter procedure to translate VALUE into OpenGL
@@ -313,8 +316,6 @@ within SHADER-PROGRAM."
      (begin body ...))
     ((_ ((name value) ...) body ...)
      (begin
-       (uniform-set! (current-shader-program)
-                     (symbol->string 'name)
-                     value)
+       (uniform-set! (current-shader-program) 'name value)
        ...
        body ...))))
-- 
cgit v1.2.3