basis: ERROR: changes.

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

diff --git a/basis/opengl/textures/textures.factor b/basis/opengl/textures/textures.factor
index f44b1fa22b1183bb95cde2e0691791dd9dcb968d..d94f7e4f02fc367dc0addd2150d920db03975c8e 100644 (file)
--- a/basis/opengl/textures/textures.factor
+++ b/basis/opengl/textures/textures.factor
@@ -148,7 +148,7 @@ M: XBGR fix-internal-component-order drop RGBA ;
 : image-internal-format ( component-order component-type -- internal-format )
     2dup
     [ fix-internal-component-order ] dip 2array image-internal-formats at
-    [ 2nip ] [ unsupported-component-order ] if* ;
+    [ 2nip ] [ throw-unsupported-component-order ] if* ;
 
 : reversed-type? ( component-type -- ? )
     { u-9-9-9-e5-components float-11-11-10-components } member? ;
@@ -167,7 +167,7 @@ M: XBGR fix-internal-component-order drop RGBA ;
             { RGBA [ drop GL_RGBA_INTEGER ] }
             { BGRX [ drop GL_BGRA_INTEGER ] }
             { RGBX [ drop GL_RGBA_INTEGER ] }
-            [ swap unsupported-component-order ]
+            [ swap throw-unsupported-component-order ]
         } case
     ] [
         swap {
@@ -189,22 +189,22 @@ M: XBGR fix-internal-component-order drop RGBA ;
             { INTENSITY [ drop GL_INTENSITY ] }
             { DEPTH [ drop GL_DEPTH_COMPONENT ] }
             { DEPTH-STENCIL [ drop GL_DEPTH_STENCIL ] }
-            [ swap unsupported-component-order ]
+            [ swap throw-unsupported-component-order ]
         } case
     ] if ;
 
 GENERIC: (component-type>type) ( component-order component-type -- gl-type )
 
-M: object (component-type>type) unsupported-component-order ;
+M: object (component-type>type) throw-unsupported-component-order ;
 
 : four-channel-alpha-first? ( component-order component-type -- ? )
     over component-count 4 =
     [ drop alpha-channel-precedes-colors? ]
-    [ unsupported-component-order ] if ;
+    [ throw-unsupported-component-order ] if ;
 
 : not-alpha-first ( component-order component-type -- )
     over alpha-channel-precedes-colors?
-    [ unsupported-component-order ]
+    [ throw-unsupported-component-order ]
     [ 2drop ] if ;
 
 M: ubyte-components          (component-type>type)
@@ -237,19 +237,23 @@ M: u-10-10-10-2-components   (component-type>type)
 
 M: u-24-components           (component-type>type)
     over DEPTH =
-    [ 2drop GL_UNSIGNED_INT ] [ unsupported-component-order ] if ;
+    [ 2drop GL_UNSIGNED_INT ]
+    [ throw-unsupported-component-order ] if ;
 
 M: u-24-8-components         (component-type>type)
     over DEPTH-STENCIL =
-    [ 2drop GL_UNSIGNED_INT_24_8 ] [ unsupported-component-order ] if ;
+    [ 2drop GL_UNSIGNED_INT_24_8 ]
+    [ throw-unsupported-component-order ] if ;
 
 M: u-9-9-9-e5-components     (component-type>type)
     over BGR =
-    [ 2drop GL_UNSIGNED_INT_5_9_9_9_REV ] [ unsupported-component-order ] if ;
+    [ 2drop GL_UNSIGNED_INT_5_9_9_9_REV ]
+    [ throw-unsupported-component-order ] if ;
 
 M: float-11-11-10-components (component-type>type)
     over BGR =
-    [ 2drop GL_UNSIGNED_INT_10F_11F_11F_REV ] [ unsupported-component-order ] if ;
+    [ 2drop GL_UNSIGNED_INT_10F_11F_11F_REV ]
+    [ throw-unsupported-component-order ] if ;
 
 : image-data-format ( component-order component-type -- gl-format gl-type )
     [ (component-order>format) ] [ (component-type>type) ] 2bi ;