summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2014-08-16 22:13:57 -0400
committerDavid Thompson <dthompson2@worcester.edu>2014-08-25 19:33:07 -0400
commit151bd0d3db02e0c09702aa3f3f953a517fd9cb2e (patch)
tree13757249bc02ae268df290eee376bc145497c18b
parent39fdda4aaba16990ac271b880059ebeb0d747b43 (diff)
Export uniform-set!
* sly/mesh.scm (draw-mesh): Use the public uniform-set! * sly/shader.scm: Export uniform-set!
-rw-r--r--sly/mesh.scm4
-rw-r--r--sly/shader.scm1
2 files changed, 2 insertions, 3 deletions
diff --git a/sly/mesh.scm b/sly/mesh.scm
index 3855330..483c9cd 100644
--- a/sly/mesh.scm
+++ b/sly/mesh.scm
@@ -188,9 +188,7 @@
(for-each (lambda (uniform)
(match uniform
((name value)
- ((@@ (sly shader) uniform-set!)
- (mesh-shader mesh)
- name value))))
+ (uniform-set! (mesh-shader mesh) name value))))
uniforms)
(with-vertex-array (mesh-vao mesh)
(if (texture? (mesh-texture mesh))
diff --git a/sly/shader.scm b/sly/shader.scm
index d8c5be5..b3e8e39 100644
--- a/sly/shader.scm
+++ b/sly/shader.scm
@@ -51,6 +51,7 @@
load-default-shader
%uniform-setters
register-uniform-setter!
+ uniform-set!
uniforms))
(define-syntax-rule (define-logger name length-proc log-proc)