From f7d9b7d50d082a6b9daf849858f5b20c6a5f141b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 28 Dec 2017 17:16:22 -0800 Subject: [PATCH] gml: fix simd --- extra/gml/viewer/viewer.factor | 3 ++- extra/gpu/render/render.factor | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extra/gml/viewer/viewer.factor b/extra/gml/viewer/viewer.factor index ae60709998..73cfe7bf37 100644 --- a/extra/gml/viewer/viewer.factor +++ b/extra/gml/viewer/viewer.factor @@ -8,9 +8,10 @@ math.order math.ranges math.vectors math.vectors.conversion math.vectors.simd math.vectors.simd.cords method-chains models namespaces sequences sets specialized-vectors typed ui ui.gadgets ui.gadgets.worlds ui.gestures ui.pixel-formats -vectors ; +vectors specialized-arrays ; FROM: math.matrices => m.v ; FROM: models => change-model ; +SPECIALIZED-ARRAY: ushort SPECIALIZED-VECTORS: ushort float-4 ; IN: gml.viewer diff --git a/extra/gpu/render/render.factor b/extra/gpu/render/render.factor index 390271119c..a63dd54101 100755 --- a/extra/gpu/render/render.factor +++ b/extra/gpu/render/render.factor @@ -169,13 +169,13 @@ M: index-elements render-vertex-indexes-instanced [ ] tri* swap index-buffer [ swap glDrawElementsInstanced ] with-gpu-data-ptr ; -M: specialized-array render-vertex-indexes +M: specialized-array-mixin render-vertex-indexes GL_ELEMENT_ARRAY_BUFFER 0 glBindBuffer [ gl-primitive-mode ] [ [ length ] [ gl-array-element-type ] [ >c-ptr ] tri ] bi* glDrawElements ; -M: specialized-array render-vertex-indexes-instanced +M: specialized-array-mixin render-vertex-indexes-instanced GL_ELEMENT_ARRAY_BUFFER 0 glBindBuffer [ gl-primitive-mode ] [ [ length ] [ gl-array-element-type ] [ >c-ptr ] tri ] @@ -258,7 +258,7 @@ DEFER: uniform-texture-accessors \ nip swap \ cleave [ ] 3sequence ; UNION: binary-data - c-ptr specialized-array struct simd-128 ; + c-ptr specialized-array-mixin struct simd-128 ; GENERIC: >uniform-bool-array ( sequence -- c-array ) GENERIC: >uniform-int-array ( sequence -- c-array )