use radix literals

[factor.git] / basis / opengl / opengl.factor

diff --git a/basis/opengl/opengl.factor b/basis/opengl/opengl.factor
index 6dcb4110a2687e3cea7bb11dd2c4d5b01a4b0762..a8b04eafbc6b03aa5cd18ee1e218bb2a8b82c047 100644 (file)
--- a/basis/opengl/opengl.factor
+++ b/basis/opengl/opengl.factor
@@ -2,11 +2,11 @@
 ! Portions copyright (C) 2007 Eduardo Cavazos.
 ! Portions copyright (C) 2008 Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types ascii calendar combinators.short-circuit
-continuations kernel libc math macros namespaces math.vectors
-math.parser opengl.gl combinators combinators.smart arrays
-sequences splitting words byte-arrays assocs vocabs
-colors colors.constants accessors generalizations
+USING: alien alien.c-types alien.data ascii calendar
+combinators.short-circuit continuations kernel libc math macros
+namespaces math.vectors math.parser opengl.gl combinators
+combinators.smart arrays sequences splitting words byte-arrays
+assocs vocabs colors colors.constants accessors generalizations
 sequences.generalizations locals fry specialized-arrays ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float
@@ -22,14 +22,14 @@ IN: opengl
 
 : error>string ( n -- string )
     H{
-        { HEX: 0 "No error" }
-        { HEX: 0501 "Invalid value" }
-        { HEX: 0500 "Invalid enumerant" }
-        { HEX: 0502 "Invalid operation" }
-        { HEX: 0503 "Stack overflow" }
-        { HEX: 0504 "Stack underflow" }
-        { HEX: 0505 "Out of memory" }
-        { HEX: 0506 "Invalid framebuffer operation" }
+        { 0x0 "No error" }
+        { 0x0501 "Invalid value" }
+        { 0x0500 "Invalid enumerant" }
+        { 0x0502 "Invalid operation" }
+        { 0x0503 "Stack overflow" }
+        { 0x0504 "Stack underflow" }
+        { 0x0505 "Out of memory" }
+        { 0x0506 "Invalid framebuffer operation" }
     } at "Unknown error" or ;
 
 TUPLE: gl-error function code string ;
@@ -139,10 +139,10 @@ MACRO: all-enabled-client-state ( seq quot -- )
     swap glPushAttrib call glPopAttrib ; inline
 
 : (gen-gl-object) ( quot -- id )
-    [ 1 0 <uint> ] dip keep *uint ; inline
+    [ 1 { uint } ] dip with-out-parameters ; inline
 
 : (delete-gl-object) ( id quot -- )
-    [ 1 swap <uint> ] dip call ; inline
+    [ 1 swap uint <ref> ] dip call ; inline
 
 : gen-gl-buffer ( -- id )
     [ glGenBuffers ] (gen-gl-object) ;
@@ -183,7 +183,7 @@ MACRO: all-enabled-client-state ( seq quot -- )
     glActiveTexture swap glBindTexture gl-error ;
 
 : (set-draw-buffers) ( buffers -- )
-    [ length ] [ >uint-array ] bi glDrawBuffers ;
+    [ length ] [ uint >c-array ] bi glDrawBuffers ;
 
 MACRO: set-draw-buffers ( buffers -- )
     words>values '[ _ (set-draw-buffers) ] ;
@@ -200,7 +200,7 @@ MACRO: set-draw-buffers ( buffers -- )
 : with-translation ( loc quot -- )
     [ [ gl-translate ] dip call ] do-matrix ; inline
 
-: fix-coordinates ( point1 point2 -- x1 y2 x2 y2 )
+: fix-coordinates ( point1 point2 -- x1 y1 x2 y2 )
     [ first2 [ >fixnum ] bi@ ] bi@ ;
 
 : gl-set-clip ( loc dim -- )