From 7f688645679364a93eb7db6c5d0c1be040fac797 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 16 Sep 2009 20:55:14 -0500 Subject: [PATCH] get gpu vocabs to load with c-type changes --- extra/gpu/demos/bunny/bunny.factor | 1 + extra/gpu/render/render.factor | 4 +++- extra/gpu/state/state.factor | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extra/gpu/demos/bunny/bunny.factor b/extra/gpu/demos/bunny/bunny.factor index 10e49984a1..d6c7456d63 100755 --- a/extra/gpu/demos/bunny/bunny.factor +++ b/extra/gpu/demos/bunny/bunny.factor @@ -7,6 +7,7 @@ io io.encodings.ascii io.files io.files.temp kernel math math.matrices math.parser math.vectors method-chains sequences splitting threads ui ui.gadgets ui.gadgets.worlds ui.pixel-formats specialized-arrays specialized-vectors ; +FROM: alien.c-types => float ; SPECIALIZED-ARRAY: float SPECIALIZED-VECTOR: uint IN: gpu.demos.bunny diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor index 0ee9ab78c5..9d8c15ab7a 100644 --- a/extra/gpu/render/render.factor +++ b/extra/gpu/render/render.factor @@ -9,7 +9,9 @@ lexer locals math math.order math.parser namespaces opengl opengl.gl parser quotations sequences slots sorting specialized-arrays strings ui.gadgets.worlds variants vocabs.parser words ; -SPECIALIZED-ARRAY: float +FROM: math => float ; +QUALIFIED-WITH: alien.c-types c +SPECIALIZED-ARRAY: c:float SPECIALIZED-ARRAY: int SPECIALIZED-ARRAY: uint SPECIALIZED-ARRAY: void* diff --git a/extra/gpu/state/state.factor b/extra/gpu/state/state.factor index 02d6046722..2bca8f72fc 100755 --- a/extra/gpu/state/state.factor +++ b/extra/gpu/state/state.factor @@ -2,8 +2,10 @@ USING: accessors alien.c-types arrays byte-arrays combinators gpu kernel literals math math.rectangles opengl opengl.gl sequences variants specialized-arrays ; +QUALIFIED-WITH: alien.c-types c +FROM: math => float ; SPECIALIZED-ARRAY: int -SPECIALIZED-ARRAY: float +SPECIALIZED-ARRAY: c:float IN: gpu.state UNION: ?rect rect POSTPONE: f ;