opengl.textures: fix merge whoops.
parent
09f4c7941f
commit
284c5ac4e3
|
@ -1,10 +1,10 @@
|
||||||
! Copyright (C) 2009, 2010 Slava Pestov.
|
! Copyright (C) 2009, 2010 Slava Pestov.
|
||||||
! See http://factorcode.org/license.txt for BSD license.
|
! See http://factorcode.org/license.txt for BSD license.
|
||||||
USING: accessors alien.data arrays assocs colors.constants
|
USING: accessors alien.data assocs cache colors.constants
|
||||||
combinators destructors fry images images.tessellation kernel
|
destructors kernel opengl opengl.gl opengl.capabilities
|
||||||
literals locals math math.statistics math.vectors namespaces
|
combinators images images.tessellation grouping sequences math
|
||||||
opengl opengl.capabilities opengl.gl sequences
|
math.statistics math.vectors generalizations fry arrays
|
||||||
specialized-arrays system ;
|
namespaces system locals literals specialized-arrays ;
|
||||||
FROM: alien.c-types => int float ;
|
FROM: alien.c-types => int float ;
|
||||||
SPECIALIZED-ARRAY: float
|
SPECIALIZED-ARRAY: float
|
||||||
IN: opengl.textures
|
IN: opengl.textures
|
||||||
|
|
Loading…
Reference in New Issue