summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2023-02-07 08:58:48 -0500
committerDavid Thompson <dthompson2@worcester.edu>2023-06-08 08:14:41 -0400
commit94b7c240720ac3a561ff91106c7698b25cd5179b (patch)
tree20e41c1275fc2c0b7bc44026a98e76008b6ed172
parent824b2739743194524ab4fe82114f144a43f9a699 (diff)
Store GLSL type name in primitive type.
-rw-r--r--chickadee/graphics/seagull.scm7
1 files changed, 2 insertions, 5 deletions
diff --git a/chickadee/graphics/seagull.scm b/chickadee/graphics/seagull.scm
index be479ba..4488c04 100644
--- a/chickadee/graphics/seagull.scm
+++ b/chickadee/graphics/seagull.scm
@@ -1934,7 +1934,7 @@
;; choosing to represent them opaquely for now to keep things simple.
(define type:mat3 (primitive-type 'mat3))
(define type:mat4 (primitive-type 'mat4))
-(define type:sampler-2d (primitive-type 'sampler-2d))
+(define type:sampler-2d (primitive-type 'sampler2D))
(define (type-descriptor->type desc)
(match desc
@@ -2212,13 +2212,10 @@
;; Transform a fully typed Seagull program into a string of GLSL code.
-(define %type-name-map
- '((sampler-2d . sampler2D)))
-
(define (type-descriptor->glsl desc)
(match desc
((? symbol?)
- (or (assq-ref %type-name-map desc) desc))
+ desc)
(('array desc* length)
(format #f "~a[~a]"
(type-descriptor->glsl desc*)