Skip to content

Commit 697a47e

Browse files
author
bluew
committed
(gl-extensions) needs to be called within with-gl-context
Clean up trailing whitespaces in viewer.rkt
1 parent 2ccc6bd commit 697a47e

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

pict3d/tests/opengl/viewer.rkt

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
(define x-rotation 0)
3535
(define y-rotation 0)
3636
(define zoom 1)
37-
37+
3838
(define/override (on-paint)
39-
(with-gl-context
39+
(with-gl-context
4040
(lambda ()
4141
(unless setup-called
4242
(setup)
@@ -79,35 +79,36 @@
7979

8080

8181
(define (show-gl-info frame canvas)
82-
(let-values (((renderer version vendor)
82+
(let-values (((renderer version vendor extensions)
8383
(send canvas with-gl-context
84-
(lambda ()
84+
(lambda ()
8585
(values
8686
(glGetString GL_RENDERER)
8787
(glGetString GL_VERSION)
88-
(glGetString GL_VENDOR))))))
88+
(glGetString GL_VENDOR)
89+
(gl-extensions))))))
8990
(define label
9091
(format "RENDERER: ~a~%VERSION: ~a~%VENDOR: ~a"
9192
renderer version vendor))
92-
(define dialog (new dialog% [parent frame] [label "OpenGL info"]))
93+
(define dialog (new dialog% [parent frame] [label "OpenGL info"]))
9394
(define msg (new message%
9495
[parent dialog]
9596
[label label]))
96-
(define extensions-list (new list-box%
97-
[parent dialog]
97+
(define extensions-list (new list-box%
98+
[parent dialog]
9899
[label "EXTENSIONS:"]
99100
[style '(single vertical-label)]
100101
[choices
101102
(sort
102-
(for/list ((ext (in-set (gl-extensions))))
103+
(for/list ((ext (in-set extensions)))
103104
(symbol->string ext))
104105
string<?)]))
105106
(send dialog show #t)))
106107

107108

108109
(define (view draw (setup void))
109-
(define frame
110-
(new frame%
110+
(define frame
111+
(new frame%
111112
[label "OpenGL viewer"]
112113
[width 300]
113114
[height 300]))
@@ -119,9 +120,9 @@
119120
(new menu% [parent menubar] [label "&Help"]))
120121

121122
(define c
122-
(new gl-viewer%
123-
(style '(gl no-autoclear))
124-
(parent frame)
123+
(new gl-viewer%
124+
(style '(gl no-autoclear))
125+
(parent frame)
125126
(draw draw) (setup setup)))
126127

127128
(define gl-info-item

0 commit comments

Comments
 (0)