opengl: properly scale viewports.

diff --git a/basis/ui/text/core-text/core-text.factor b/basis/ui/text/core-text/core-text.factor
index 3f66ae60cd41aef1aee01d6cb6cdac99951587a9..7636349b87221f1085894a09fd3d8e619edca2be 100644 (file)
--- a/basis/ui/text/core-text/core-text.factor
+++ b/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 [

diff --git a/extra/gpu/state/state.factor b/extra/gpu/state/state.factor
index c1ff32e3f9300fa83d8367e92df924102083cc6f..663a5d9a54ae026e5ccc51851fa8e291394900d8 100755 (executable)
--- a/extra/gpu/state/state.factor
+++ b/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*
     {

diff --git a/extra/gpu/textures/textures.factor b/extra/gpu/textures/textures.factor
index 53670da424bfa0437192f5f8383e56e9ef7a0d7a..fe043b0c260d8b1f3513acdaa07762c120a45e1f 100644 (file)
--- a/extra/gpu/textures/textures.factor
+++ b/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 )

diff --git a/extra/opengl/demo-support/demo-support.factor b/extra/opengl/demo-support/demo-support.factor
index 2c7258bb68e1b7aca591eae5ba6b259a2a081763..d8ce4739fb43a467ddf407b6d1f030f35de6e1aa 100644 (file)
--- a/extra/opengl/demo-support/demo-support.factor
+++ b/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 -- )

diff --git a/extra/spheres/spheres.factor b/extra/spheres/spheres.factor
index 819dbe892e861613e18f3d92cf55181b3252870d..53f8717410f270085ea60c01141f19107e7790aa 100644 (file)
--- a/extra/spheres/spheres.factor
+++ b/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
         ]

diff --git a/extra/terrain/terrain.factor b/extra/terrain/terrain.factor
index 5a6585103706c6e100574091dc0b3d9f33dc5e0e..ad2d9aec96f3c1ef3408614daaddfcc5194daf47 100644 (file)
--- a/extra/terrain/terrain.factor
+++ b/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*