opengl: properly scale viewports.

basis/ui/text/core-text/core-text.factor

@@ -12,13 +12,13 @@ SINGLETON: core-text-renderer
 <PRIVATE
 
 : unscale ( m -- n )
-    retina? get-global [ 2.0 / ] when ; inline
+    retina? get-global [ 2 /i ] when ; inline
 
 : scale ( m -- n )
-    retina? get-global [ 2.0 * ] when ; inline
+    retina? get-global [ 2 * ] when ; inline
 
 : scale-dim ( dim -- dim' )
-    retina? get-global [ [ 2.0 / ] map ] when ; inline
+    retina? get-global [ [ 2 /i ] map ] when ; inline
 
 : scale-metrics ( metrics -- metrics' )
     retina? get-global [

extra/gpu/state/state.factor

@@ -310,7 +310,7 @@ PRIVATE>
 GENERIC: set-gpu-state* ( state -- )
 
 M: viewport-state set-gpu-state*
-    rect>> [ loc>> first2 ] [ dim>> first2 ] bi glViewport ;
+    rect>> [ loc>> ] [ dim>> ] bi gl-viewport ;
 
 M: triangle-cull-state set-gpu-state*
     {

extra/gpu/textures/textures.factor

@@ -265,7 +265,7 @@ M:: texture-2d-data-target texture-dim ( tdt level -- dim )
 
 M:: texture-3d-data-target texture-dim ( tdt level -- dim )
     tdt bind-tdt :> texture
-    tdt texture-data-gl-target level 
+    tdt texture-data-gl-target level
     [ GL_TEXTURE_WIDTH get-texture-int ]
     [ GL_TEXTURE_HEIGHT get-texture-int ]
     [ GL_TEXTURE_DEPTH get-texture-int ] 2tri
@@ -307,7 +307,7 @@ TYPED: read-compressed-texture ( tdt: texture-data-target level: integer -- byte
     [ texture-dim ]
     [ drop texture-object [ component-order>> ] [ component-type>> ] bi f f ]
     [ read-texture ] 2tri
-    image boa ; inline
+    f image boa ; inline
 
 <PRIVATE
 : bind-texture ( texture -- gl-target )

extra/opengl/demo-support/demo-support.factor

@@ -51,7 +51,7 @@ M: demo-world pref-dim* ( gadget -- dim )
 M: demo-world resize-world
     GL_PROJECTION glMatrixMode
     glLoadIdentity
-    [ [ 0 0 ] dip dim>> first2 glViewport ]
+    [ [ { 0 0 } ] dip dim>> gl-viewport ]
     [ demo-world-frustum glFrustum ] bi ;
 
 : demo-world-set-matrix ( gadget -- )

extra/spheres/spheres.factor

@@ -248,7 +248,7 @@ M: spheres-world end-world
 
 : (draw-reflection-texture) ( gadget -- )
     dup reflection-framebuffer>> [ {
-        [ drop 0 0 (reflection-dim) glViewport ]
+        [ drop { 0 0 } (reflection-dim) 2array gl-viewport ]
         [
             GL_PROJECTION glMatrixMode
             glPushMatrix glLoadIdentity
@@ -275,7 +275,7 @@ M: spheres-world end-world
           glPopMatrix 90.0 1.0 0.0 0.0 glRotatef ]
         [ sphere-scene ]
         [
-            [ 0 0 ] dip dim>> first2 glViewport
+            [ { 0 0 } ] dip dim>> gl-viewport
             GL_PROJECTION glMatrixMode
             glPopMatrix
         ]

extra/terrain/terrain.factor

@@ -266,7 +266,7 @@ M: terrain-world end-game-world
 M: terrain-world resize-world
     GL_PROJECTION glMatrixMode
     glLoadIdentity
-    dim>> [ [ 0 0 ] dip first2 glViewport ]
+    dim>> [ [ { 0 0 } ] dip gl-viewport ]
     [ frustum glFrustum ] bi ;
 
 M: terrain-world draw-world*