Merge branch 'master' of github.com:tonyrog/cl

tonyrog · Mar 7, 2019 · 8c91541 · 8c91541
2 parents a80904c + 101d41c
commit 8c91541
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/c_src/cl_nif.c b/c_src/cl_nif.c
@@ -761,7 +761,7 @@ ErlNifFunc ecl_funcs[] =
 #if CL_VERSION_1_1 == 1
     { "enqueue_copy_buffer_rect",  11, ecl_enqueue_copy_buffer_rect },
 #endif
-    { "enqueue_copy_image",         6, ecl_enqueue_copy_image },
+    { "enqueue_copy_image",         7, ecl_enqueue_copy_image },
 #if CL_VERSION_1_2 == 1
     { "enqueue_fill_image",         6, ecl_enqueue_fill_image },
 #endif

diff --git a/src/cl.erl b/src/cl.erl
@@ -173,7 +173,7 @@
 -export([nowait_enqueue_write_image/8]).
 -export([enqueue_copy_buffer/7]).
 -export([enqueue_copy_buffer_rect/11]).
--export([enqueue_copy_image/6]).
+-export([enqueue_copy_image/7]).
 -export([enqueue_fill_image/6]).
 -export([enqueue_copy_image_to_buffer/7]).
 -export([enqueue_copy_buffer_to_image/7]).
@@ -2173,7 +2173,7 @@ enqueue_copy_buffer_rect(_Queue, _SrcBuffer, _DstBuffer,
 			 _WaitList) ->
     ?nif_stub.
 
-enqueue_copy_image(_QUeue, _SrcImage, _DstImage, _Origin, _Region, _WaitList) ->
+enqueue_copy_image(_QUeue, _SrcImage, _DstImage, _SourceOrigin, _DestOrigin, _Region, _WaitList) ->
     ?nif_stub.
 
 %%  FillColor = <<R:32/unsigned,G:32/unsigned,B:32/unsigned,A:32/unsigned>>

diff --git a/src/cl10.erl b/src/cl10.erl
@@ -105,7 +105,7 @@
 -export([enqueue_write_image/8]).
 -export([enqueue_write_image/9]).
 -export([nowait_enqueue_write_image/8]).
--export([enqueue_copy_image/6]).
+-export([enqueue_copy_image/7]).
 -export([enqueue_copy_image_to_buffer/7]).
 -export([enqueue_copy_buffer_to_image/7]).
 -export([enqueue_map_buffer/6]).
@@ -230,8 +230,8 @@ enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8,A9) ->
     cl:enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8,A9).
 nowait_enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8) -> 
     cl:nowait_enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8).
-enqueue_copy_image(A1,A2,A3,A4,A5,A6) ->
-    cl:enqueue_copy_image(A1,A2,A3,A4,A5,A6).
+enqueue_copy_image(A1,A2,A3,A4,A5,A6,A7) ->
+    cl:enqueue_copy_image(A1,A2,A3,A4,A5,A6,A7).
 enqueue_copy_image_to_buffer(A1,A2,A3,A4,A5,A6,A7) ->
     cl:enqueue_copy_image_to_buffer(A1,A2,A3,A4,A5,A6,A7).
 enqueue_copy_buffer_to_image(A1,A2,A3,A4,A5,A6,A7) ->

diff --git a/src/cl11.erl b/src/cl11.erl
@@ -105,7 +105,7 @@
 -export([enqueue_write_image/8]).
 -export([enqueue_write_image/9]).
 -export([nowait_enqueue_write_image/8]).
--export([enqueue_copy_image/6]).
+-export([enqueue_copy_image/7]).
 -export([enqueue_copy_image_to_buffer/7]).
 -export([enqueue_copy_buffer_to_image/7]).
 -export([enqueue_map_buffer/6]).
@@ -230,8 +230,8 @@ enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8,A9) ->
     cl:enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8,A9).
 nowait_enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8) -> 
     cl:nowait_enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8).
-enqueue_copy_image(A1,A2,A3,A4,A5,A6) ->
-    cl:enqueue_copy_image(A1,A2,A3,A4,A5,A6).
+enqueue_copy_image(A1,A2,A3,A4,A5,A6,A7) ->
+    cl:enqueue_copy_image(A1,A2,A3,A4,A5,A6,A7).
 enqueue_copy_image_to_buffer(A1,A2,A3,A4,A5,A6,A7) ->
     cl:enqueue_copy_image_to_buffer(A1,A2,A3,A4,A5,A6,A7).
 enqueue_copy_buffer_to_image(A1,A2,A3,A4,A5,A6,A7) ->

diff --git a/src/cl12.erl b/src/cl12.erl
@@ -94,7 +94,7 @@
 -export([enqueue_write_image/8]).
 -export([enqueue_write_image/9]).
 -export([nowait_enqueue_write_image/8]).
--export([enqueue_copy_image/6]).
+-export([enqueue_copy_image/7]).
 -export([enqueue_copy_image_to_buffer/7]).
 -export([enqueue_copy_buffer_to_image/7]).
 -export([enqueue_map_buffer/6]).
@@ -217,8 +217,8 @@ enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8,A9) ->
     cl:enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8,A9).
 nowait_enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8) ->
     cl:nowait_enqueue_write_image(A1,A2,A3,A4,A5,A6,A7,A8).
-enqueue_copy_image(A1,A2,A3,A4,A5,A6) ->
-    cl:enqueue_copy_image(A1,A2,A3,A4,A5,A6).
+enqueue_copy_image(A1,A2,A3,A4,A5,A6,A7) ->
+    cl:enqueue_copy_image(A1,A2,A3,A4,A5,A6,A7).
 enqueue_copy_image_to_buffer(A1,A2,A3,A4,A5,A6,A7) ->
     cl:enqueue_copy_image_to_buffer(A1,A2,A3,A4,A5,A6,A7).
 enqueue_copy_buffer_to_image(A1,A2,A3,A4,A5,A6,A7) ->