From a8f8bc443c18d589aa7f1aaa3d53ce8b3840f0c8 Mon Sep 17 00:00:00 2001
From: SunSerega <latchenko3@yandex.ru>
Date: Thu, 6 Jun 2019 18:08:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=BE=D1=87=D0=B5=D0=B9=20=D0=B2=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D1=80=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InstallerSamples/Open[CL,GL]/OpenCL/MatrMlt.cl |  4 ++--
 .../Open[CL,GL]/OpenCLABC/MatrMlt.cl           |  4 ++--
 .../Open[CL,GL]/OpenCLABC/MatrMlt.pas          | 18 +++++++++---------
 .../Open[CL,GL]/OpenCLABC/SimpleAddition.pas   |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/InstallerSamples/Open[CL,GL]/OpenCL/MatrMlt.cl b/InstallerSamples/Open[CL,GL]/OpenCL/MatrMlt.cl
index d3e1ed500..e1496db23 100644
--- a/InstallerSamples/Open[CL,GL]/OpenCL/MatrMlt.cl
+++ b/InstallerSamples/Open[CL,GL]/OpenCL/MatrMlt.cl
@@ -14,14 +14,14 @@ __kernel void MatrMltMatr(__global double* A, __global double* B, __global doubl
 	C[cX + cY*W] = sum;
 }
 
-__kernel void MatrMltVec(__global double* C, __global double* V, __global double* V2, __global int* gW)
+__kernel void MatrMltVec(__global double* C, __global double* V1, __global double* V2, __global int* gW)
 {
 	int i = get_global_id(0);
 	int W = *gW;
 	
 	double sum = 0.0;
 	for (int j=0; j<W; j++)
-		sum += C[j + i*W] * V[j];
+		sum += C[j + i*W] * V1[j];
 	
 	V2[i] = sum;
 }
diff --git a/InstallerSamples/Open[CL,GL]/OpenCLABC/MatrMlt.cl b/InstallerSamples/Open[CL,GL]/OpenCLABC/MatrMlt.cl
index d3e1ed500..e1496db23 100644
--- a/InstallerSamples/Open[CL,GL]/OpenCLABC/MatrMlt.cl
+++ b/InstallerSamples/Open[CL,GL]/OpenCLABC/MatrMlt.cl
@@ -14,14 +14,14 @@ __kernel void MatrMltMatr(__global double* A, __global double* B, __global doubl
 	C[cX + cY*W] = sum;
 }
 
-__kernel void MatrMltVec(__global double* C, __global double* V, __global double* V2, __global int* gW)
+__kernel void MatrMltVec(__global double* C, __global double* V1, __global double* V2, __global int* gW)
 {
 	int i = get_global_id(0);
 	int W = *gW;
 	
 	double sum = 0.0;
 	for (int j=0; j<W; j++)
-		sum += C[j + i*W] * V[j];
+		sum += C[j + i*W] * V1[j];
 	
 	V2[i] = sum;
 }
diff --git a/InstallerSamples/Open[CL,GL]/OpenCLABC/MatrMlt.pas b/InstallerSamples/Open[CL,GL]/OpenCLABC/MatrMlt.pas
index 4eb3cb8fb..f66c6dfe4 100644
--- a/InstallerSamples/Open[CL,GL]/OpenCLABC/MatrMlt.pas
+++ b/InstallerSamples/Open[CL,GL]/OpenCLABC/MatrMlt.pas
@@ -48,11 +48,11 @@ begin
   
   var Calc_C_Q :=
     code['MatrMltMatr'].NewQueue.Exec(MatrW, MatrW,
-      A.NewQueue.WriteData(A_Mart),
-      B.NewQueue.WriteData(B_Mart),
+      A.NewQueue.WriteData(A_Mart) as CommandQueue<KernelArg>,
+      B.NewQueue.WriteData(B_Mart) as CommandQueue<KernelArg>,
       C,
-      KernelArg.ValueQueue(MatrW)
-    );
+      KernelArg.ValueQueue(MatrW) as CommandQueue<KernelArg>
+    ) as CommandQueue<Kernel>;
   
   var Otp_C_Q :=
     HFQ(
@@ -66,15 +66,15 @@ begin
           writeln;
         end;
       end
-    );
+    ) as CommandQueue<array[,] of real>;
   
   var Calc_V2_Q :=
     code['MatrMltVec'].NewQueue.Exec(MatrW,
       C,
-      V1.NewQueue.WriteData(V1_Arr),
+      V1.NewQueue.WriteData(V1_Arr) as CommandQueue<KernelArg>,
       V2,
-      KernelArg.ValueQueue(MatrW)
-    );
+      KernelArg.ValueQueue(MatrW) as CommandQueue<KernelArg>
+    ) as CommandQueue<Kernel>;
   
   var Otp_V2_Q :=
     HFQ(
@@ -88,7 +88,7 @@ begin
           writeln;
         end;
       end
-    );
+    ) as CommandQueue<array of real>;
   
   // Выполнение всего и сразу асинхронный вывод
   
diff --git a/InstallerSamples/Open[CL,GL]/OpenCLABC/SimpleAddition.pas b/InstallerSamples/Open[CL,GL]/OpenCLABC/SimpleAddition.pas
index 37af718ae..9659e83c8 100644
--- a/InstallerSamples/Open[CL,GL]/OpenCLABC/SimpleAddition.pas
+++ b/InstallerSamples/Open[CL,GL]/OpenCLABC/SimpleAddition.pas
@@ -26,9 +26,9 @@ begin
       
       A.NewQueue.WriteData(
         ArrFill(10,1)
-      )
+      ) as CommandQueue<KernelArg>
       
-    );
+    ) as CommandQueue<Kernel>;
   
   // Выполнение