opencl: remove <size_t> (use size_t <ref> instead).

diff --git a/extra/opencl/ffi/ffi.factor b/extra/opencl/ffi/ffi.factor
index d6e702ed6f336843055144fa85f65949be841d3e..5b7b42235dcc346e50f6d2d5253535a007ac9ba9 100644 (file)
--- a/extra/opencl/ffi/ffi.factor
+++ b/extra/opencl/ffi/ffi.factor
@@ -604,16 +604,3 @@ FUNCTION: cl_mem clCreateFromD3D11Texture2DNV ( cl_context context, cl_mem_flags
 FUNCTION: cl_mem clCreateFromD3D11Texture3DNV ( cl_context context, cl_mem_flags flags, void* id3dtexture3d_resource, uint subresource, cl_int* errcode_ret ) ;
 FUNCTION: cl_int clEnqueueAcquireD3D11ObjectsNV ( cl_command_queue command_queue, cl_uint num_objects, cl_mem* mem_objects, cl_uint num_events_in_wait_list, cl_event* event_wait_list, cl_event* event ) ;
 FUNCTION: cl_int clEnqueueReleaseD3D11ObjectsNV ( cl_command_queue command_queue, cl_uint num_objects, cl_mem* mem_objects, cl_uint num_events_in_wait_list, cl_event* event_wait_list, cl_event* event ) ;
-
-! Utility words needed for working with the API
-: *size_t ( c-ptr -- value )
-    size_t heap-size {
-        { 4 [ 0 alien-unsigned-4 ] }
-        { 8 [ 0 alien-unsigned-8 ] }
-    } case ; inline
-
-: <size_t> ( value -- c-ptr )
-    size_t heap-size [ (byte-array) ] keep {
-        { 4 [ [ 0 set-alien-unsigned-4 ] keep ] }
-        { 8 [ [ 0 set-alien-unsigned-8 ] keep ] }
-    } case ; inline

diff --git a/extra/opencl/opencl-tests.factor b/extra/opencl/opencl-tests.factor
index 15eaf0646c8a3d04ae9cd8247a0b54343c96aa01..a8104625a9f7481d908b3bb458ee98809098b6dc 100644 (file)
--- a/extra/opencl/opencl-tests.factor
+++ b/extra/opencl/opencl-tests.factor
@@ -31,10 +31,10 @@ __kernel void square(
             "" kernel-source 1array <cl-program> &dispose "square" <cl-kernel> &dispose :> kernel
             cl-read-access num-bytes in <cl-buffer> &dispose :> in-buffer
             cl-write-access num-bytes f <cl-buffer> &dispose :> out-buffer
-           
+
             kernel in-buffer out-buffer num-floats uint <ref> 3array
             { num-floats } [ ] cl-queue-kernel &dispose drop
-            
+
             cl-finish
 
             out-buffer 0 num-bytes <cl-buffer-range>

diff --git a/extra/opencl/opencl.factor b/extra/opencl/opencl.factor
index 2371d2c058ff3ab839a6cf3f2f2141047cb55703..def384df2cc31104992148519972edca3f726e01 100644 (file)
--- a/extra/opencl/opencl.factor
+++ b/extra/opencl/opencl.factor
@@ -18,7 +18,7 @@ ERROR: cl-error err ;
     dup f = [ cl-error ] [ drop ] if ; inline
  
 : info-data-size ( handle name info-quot -- size_t )
-    [ 0 f 0 <size_t> ] dip [ call cl-success ] 2keep drop size_t deref ; inline
+    [ 0 f 0 size_t <ref> ] dip [ call cl-success ] 2keep drop size_t deref ; inline
 
 : info-data-bytes ( handle name info-quot size -- bytes )
     swap [ dup <byte-array> f ] dip [ call cl-success ] 3keep 2drop ; inline
@@ -27,7 +27,7 @@ ERROR: cl-error err ;
     [ 3dup info-data-size info-data-bytes ] dip call ; inline
 
 : 2info-data-size ( handle1 handle2 name info-quot -- size_t )
-    [ 0 f 0 <size_t> ] dip [ call cl-success ] 2keep drop size_t deref ; inline
+    [ 0 f 0 size_t <ref> ] dip [ call cl-success ] 2keep drop size_t deref ; inline
 
 : 2info-data-bytes ( handle1 handle2 name info-quot size -- bytes )
     swap [ dup <byte-array> f ] dip [ call cl-success ] 3keep 2drop ; inline
@@ -63,6 +63,7 @@ ERROR: cl-error err ;
     [ [ length size_t heap-size / ] keep swap size_t <c-direct-array> ] info ; inline
 
 TUPLE: cl-handle < disposable handle ;
+
 PRIVATE>
 
 VARIANT: cl-device-type