diff --git a/basis/opengl/textures/textures.factor b/basis/opengl/textures/textures.factor index 9284a151f5..2341706f4c 100644 --- a/basis/opengl/textures/textures.factor +++ b/basis/opengl/textures/textures.factor @@ -5,7 +5,7 @@ kernel opengl opengl.gl opengl.capabilities combinators images images.tesselation grouping sequences math math.vectors generalizations fry arrays namespaces system locals literals specialized-arrays ; -FROM: alien.c-types => float ; +FROM: alien.c-types => float *float *int ; SPECIALIZED-ARRAY: float IN: opengl.textures @@ -404,3 +404,9 @@ PRIVATE> over dim>> max-texture-size [ <= ] 2all? [ ] [ [ max-texture-size tesselate ] dip ] if ; + +: get-texture-float ( target level enum -- value ) + 0 [ glGetTexLevelParameterfv ] keep *float ; inline +: get-texture-int ( target level enum -- value ) + 0 [ glGetTexLevelParameteriv ] keep *int ; inline + diff --git a/extra/gpu/textures/textures.factor b/extra/gpu/textures/textures.factor index 132e4303e7..a240aae945 100644 --- a/extra/gpu/textures/textures.factor +++ b/extra/gpu/textures/textures.factor @@ -176,11 +176,6 @@ M: cube-map-face texture-data-gl-target texture [ texture-gl-target ] [ handle>> ] bi glBindTexture texture ; inline -: get-texture-float ( target level enum -- value ) - 0 [ glGetTexLevelParameterfv ] keep *float ; inline -: get-texture-int ( target level enum -- value ) - 0 [ glGetTexLevelParameteriv ] keep *int ; inline - : ?product ( x -- y ) dup number? [ product ] unless ; inline