Switch to building OpenCLNet from sources in submodule

CUETools.Codecs.FLACCL/CUETools.Codecs.FLACCL.csproj

@@ -54,10 +54,6 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenCLNet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ThirdParty\OpenCLNet.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -82,6 +78,10 @@
       <Name>CUETools.Codecs</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\ThirdParty\openclnet\source\OpenCLNet.csproj">
+      <Project>{8373e3b2-16f0-4fd3-a13b-0b0248ffc228}</Project>
+      <Name>OpenCLNet</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="flac.cl">

CUETools/CUETools.sln

@@ -35,7 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Third party binaries", "Thi
 		..\ThirdParty\Freedb.dll = ..\ThirdParty\Freedb.dll
 		..\ThirdParty\ICSharpCode.SharpZipLib.dll = ..\ThirdParty\ICSharpCode.SharpZipLib.dll
 		..\ThirdParty\MusicBrainz.dll = ..\ThirdParty\MusicBrainz.dll
-		..\ThirdParty\OpenCLNet.dll = ..\ThirdParty\OpenCLNet.dll
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Win32", "Win32", "{9A0D1EB8-269E-4165-971C-541C96AA506F}"
@@ -152,8 +151,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Codecs.FLACCL", ".
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.FLACL.cmd", "..\CUETools.FLACCL.cmd\CUETools.FLACL.cmd.csproj", "{1FCA8834-34E6-47CF-B53F-D8DF35345363}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenCLNet", "..\OpenCLNet\OpenCLNet.csproj", "{758285C6-1ACA-458A-9906-EE6701D5AF87}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.CTDB.EACPlugin", "..\CUETools.CTDB.EACPlugin\CUETools.CTDB.EACPlugin.csproj", "{816D964C-9772-46C5-AF1D-49E8C78A1E7C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.TestHelpers", "..\CUETools.TestHelpers\CUETools.TestHelpers.csproj", "{84EBB7CB-02C9-40A9-9D32-C641B822DAA2}"
@@ -192,6 +189,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLAC_dynamic", "..\Third
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MACLib", "..\ThirdParty\MAC_SDK\Source\Projects\VS2017\MACLib\MACLib.vcxproj", "{21BF980F-C022-4DCC-9250-7C73528E422B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenCLNet", "..\ThirdParty\openclnet\source\OpenCLNet.csproj", "{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -872,24 +871,6 @@ Global
 		{1FCA8834-34E6-47CF-B53F-D8DF35345363}.Release|Win32.ActiveCfg = Release|Any CPU
 		{1FCA8834-34E6-47CF-B53F-D8DF35345363}.Release|x64.ActiveCfg = Release|Any CPU
 		{1FCA8834-34E6-47CF-B53F-D8DF35345363}.Release|x86.ActiveCfg = Release|Any CPU
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|Win32.ActiveCfg = Debug|x86
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|x64.ActiveCfg = Debug|x64
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|x64.Build.0 = Debug|x64
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|x86.ActiveCfg = Debug|x86
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Debug|x86.Build.0 = Debug|x86
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|Mixed Platforms.Build.0 = Release|x86
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|Win32.ActiveCfg = Release|Any CPU
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|x64.ActiveCfg = Release|x64
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|x64.Build.0 = Release|x64
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|x86.ActiveCfg = Release|x86
-		{758285C6-1ACA-458A-9906-EE6701D5AF87}.Release|x86.Build.0 = Release|x86
 		{816D964C-9772-46C5-AF1D-49E8C78A1E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{816D964C-9772-46C5-AF1D-49E8C78A1E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{816D964C-9772-46C5-AF1D-49E8C78A1E7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -1091,9 +1072,7 @@ Global
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|Win32.Build.0 = Debug|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|x64.Build.0 = Debug|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Debug|x86.Build.0 = Debug|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1101,9 +1080,7 @@ Global
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|Win32.Build.0 = Release|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|x64.ActiveCfg = Release|Any CPU
-		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|x64.Build.0 = Release|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|x86.ActiveCfg = Release|Any CPU
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839}.Release|x86.Build.0 = Release|Any CPU
 		{4CEFBC83-C215-11DB-8314-0800200C9A66}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -1142,6 +1119,22 @@ Global
 		{21BF980F-C022-4DCC-9250-7C73528E422B}.Release|x64.Build.0 = Release|x64
 		{21BF980F-C022-4DCC-9250-7C73528E422B}.Release|x86.ActiveCfg = Release|Win32
 		{21BF980F-C022-4DCC-9250-7C73528E422B}.Release|x86.Build.0 = Release|Win32
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Debug|x86.Build.0 = Debug|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Release|Win32.ActiveCfg = Release|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Release|x64.ActiveCfg = Release|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Release|x86.ActiveCfg = Release|Any CPU
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1185,7 +1178,6 @@ Global
 		{1AF02E2C-2CB2-44B5-B417-37653071FEC6} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{DFE55765-564C-4B8F-993B-A94C4D1C212E} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{1FCA8834-34E6-47CF-B53F-D8DF35345363} = {4B59E09C-A51F-4B80-91BE-987904DCEF7D}
-		{758285C6-1ACA-458A-9906-EE6701D5AF87} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
 		{816D964C-9772-46C5-AF1D-49E8C78A1E7C} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64}
 		{84EBB7CB-02C9-40A9-9D32-C641B822DAA2} = {D9D97BB6-002F-4858-8EF2-49B4C4C4DDB4}
 		{0AC7691C-562A-4879-8A11-6C7890BF659B} = {86BBE3FC-E4E5-4190-B675-C6745EAF4E64}
@@ -1198,8 +1190,9 @@ Global
 		{2D8D7A03-DFFA-44EF-9299-8BB56D122245} = {BC0C1801-0212-4ECC-92D5-8F2D6F69E888}
 		{F10AB92C-9AFB-4FC0-94E0-06FCD3CA8155} = {93B7AE1D-DEF6-4A04-A222-5CDE09DF262D}
 		{1219A514-D3FA-40DB-BBB2-92CE05E35839} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
-		{4CEFBC83-C215-11DB-8314-0800200C9A66} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
+		{4CEFBC83-C215-11DB-8314-0800200C9A66} = {8B179853-B7D6-479C-B8B2-6CBCE835D040}
 		{21BF980F-C022-4DCC-9250-7C73528E422B} = {8B179853-B7D6-479C-B8B2-6CBCE835D040}
+		{8373E3B2-16F0-4FD3-A13B-0B0248FFC228} = {7E402406-7E51-4F0D-8209-60824C1CD6E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C634D169-5814-4203-94B6-6A11371DDA95}

ThirdParty/openclnet.patch

@@ -1,206 +0,0 @@
-Index: projects/vs2008/UnitTests/Form1.cs
-===================================================================
---- projects/vs2008/UnitTests/Form1.cs	(revision 133)
-+++ projects/vs2008/UnitTests/Form1.cs	(working copy)
-@@ -629,7 +629,7 @@
- 
-             try
-             {
--                img0 = c.CreateImage2D(MemFlags.READ_WRITE, ImageFormat.RGBA8U, imgWidth, imgHeight);
-+                img0 = c.CreateImage2D(MemFlags.READ_WRITE, CLImageFormat.RGBA8U, imgWidth, imgHeight);
-                 mem0 = c.CreateBuffer(MemFlags.READ_WRITE, bufLen, IntPtr.Zero);
- 
-                 Array.Clear(cmpData, 0, cmpData.Length);
-@@ -1198,7 +1198,7 @@
- 
-             try
-             {
--                img0 = c.CreateImage2D(MemFlags.READ_WRITE, ImageFormat.RGBA8U, imgWidth, imgHeight);
-+                img0 = c.CreateImage2D(MemFlags.READ_WRITE, CLImageFormat.RGBA8U, imgWidth, imgHeight);
-                 mem0 = c.CreateBuffer(MemFlags.READ_WRITE, bufLen, IntPtr.Zero);
- 
-                 Array.Clear(cmpData, 0, cmpData.Length);
-@@ -1405,9 +1405,9 @@
- 
-             try
-             {
--                img0 = c.CreateImage2D(MemFlags.READ_WRITE, ImageFormat.RGBA8U, imgWidth, imgHeight);
--                img1 = c.CreateImage2D(MemFlags.READ_WRITE, ImageFormat.RGBA8U, imgWidth, imgHeight);
--                img2 = c.CreateImage2D(MemFlags.READ_WRITE, ImageFormat.RGBA8U, imgWidth, imgHeight);
-+                img0 = c.CreateImage2D(MemFlags.READ_WRITE, CLImageFormat.RGBA8U, imgWidth, imgHeight);
-+                img1 = c.CreateImage2D(MemFlags.READ_WRITE, CLImageFormat.RGBA8U, imgWidth, imgHeight);
-+                img2 = c.CreateImage2D(MemFlags.READ_WRITE, CLImageFormat.RGBA8U, imgWidth, imgHeight);
- 
-                 Array.Clear(cmpData, 0, cmpData.Length);
-                 fixed (byte* pSrc = srcData)
-Index: projects/vs2010/OpenCLNet.suo
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: projects/vs2010/OpenCLNet/OpenCLNet.csproj
-===================================================================
---- projects/vs2010/OpenCLNet/OpenCLNet.csproj	(revision 133)
-+++ projects/vs2010/OpenCLNet/OpenCLNet.csproj	(working copy)
-@@ -10,8 +10,9 @@
-     <AppDesignerFolder>Properties</AppDesignerFolder>
-     <RootNamespace>OpenCLNet</RootNamespace>
-     <AssemblyName>OpenCLNet</AssemblyName>
--    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-     <FileAlignment>512</FileAlignment>
-+    <TargetFrameworkProfile />
-   </PropertyGroup>
-   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-     <DebugSymbols>true</DebugSymbols>
-@@ -73,11 +74,7 @@
-   </PropertyGroup>
-   <ItemGroup>
-     <Reference Include="System" />
--    <Reference Include="System.Core" />
-     <Reference Include="System.Drawing" />
--    <Reference Include="System.Xml.Linq" />
--    <Reference Include="System.Data.DataSetExtensions" />
--    <Reference Include="Microsoft.CSharp" />
-     <Reference Include="System.Data" />
-     <Reference Include="System.Xml" />
-   </ItemGroup>
-Index: source/CLImage.cs
-===================================================================
---- source/CLImage.cs	(revision 133)
-+++ source/CLImage.cs	(working copy)
-@@ -25,7 +25,6 @@
- 
- using System;
- using System.Collections.Generic;
--using System.Linq;
- using System.Text;
- using System.Runtime.InteropServices;
- 
-Index: source/Device.cs
-===================================================================
---- source/Device.cs	(revision 133)
-+++ source/Device.cs	(working copy)
-@@ -35,7 +35,7 @@
- {
-     unsafe public class Device : IDisposable, InteropTools.IPropertyContainer
-     {
--        protected HashSet<string> ExtensionHashSet = new HashSet<string>();
-+        protected List<string> ExtensionHashSet = new List<string>();
-         private bool IsSubDevice;
-         // Track whether Dispose has been called.
-         private bool disposed = false;
-Index: source/Event.cs
-===================================================================
---- source/Event.cs	(revision 133)
-+++ source/Event.cs	(working copy)
-@@ -25,7 +25,6 @@
- 
- using System;
- using System.Collections.Generic;
--using System.Linq;
- using System.Text;
- using System.Threading;
- 
-Index: source/Exceptions.cs
-===================================================================
---- source/Exceptions.cs	(revision 133)
-+++ source/Exceptions.cs	(working copy)
-@@ -25,7 +25,6 @@
- 
- using System;
- using System.Collections.Generic;
--using System.Linq;
- using System.Text;
- 
- namespace OpenCLNet
-Index: source/OpenCLAPI.cs
-===================================================================
---- source/OpenCLAPI.cs	(revision 133)
-+++ source/OpenCLAPI.cs	(working copy)
-@@ -25,7 +25,6 @@
- 
- using System;
- using System.Collections.Generic;
--using System.Linq;
- using System.Text;
- using System.Runtime.InteropServices;
- using System.Diagnostics;
-Index: source/OpenCLManager.cs
-===================================================================
---- source/OpenCLManager.cs	(revision 133)
-+++ source/OpenCLManager.cs	(working copy)
-@@ -27,7 +27,6 @@
- using System.Collections.Generic;
- using System.ComponentModel;
- using System.Diagnostics;
--using System.Linq;
- using System.Text;
- using System.IO;
- using System.Xml;
-@@ -257,9 +256,8 @@
-                 throw new OpenCLNotAvailableException();
- 
-             Platform = OpenCL.GetPlatform(platformNumber);
--            var devices = from d in Platform.QueryDevices(deviceType)
--                    where ((RequireImageSupport && d.ImageSupport == true) || !RequireImageSupport) && d.HasExtensions( RequiredExtensions.ToArray<string>() )
--                    select d;
-+            var devices = new List<Device>(Platform.QueryDevices(deviceType));
-+            devices.RemoveAll(d => (d.ImageSupport != true && RequireImageSupport) || !d.HasExtensions(RequiredExtensions.ToArray()));
-             IntPtr[] properties = new IntPtr[]
-             {
-                 (IntPtr)ContextProperties.PLATFORM, Platform,
-@@ -266,7 +264,7 @@
-                 IntPtr.Zero
-             };
- 
--            if (devices.Count() == 0)
-+            if (devices.Count == 0)
-                 throw new OpenCLException("CreateDefaultContext: No OpenCL devices found that matched filter criteria.");
- 
-             CreateContext(Platform, properties, devices);
-@@ -308,7 +306,7 @@
-                 throw new OpenCLNotAvailableException();
- 
-             Platform = platform;
--            Context = platform.CreateContext( contextProperties, devices.ToArray<Device>(), notify, userData );
-+            Context = platform.CreateContext( contextProperties, new List<Device>(devices).ToArray(), notify, userData );
-             CQ = new CommandQueue[Context.Devices.Length];
-             for (int i = 0; i < Context.Devices.Length; i++)
-                 CQ[i] = Context.CreateCommandQueue(Context.Devices[0]);
-Index: source/Platform.cs
-===================================================================
---- source/Platform.cs	(revision 133)
-+++ source/Platform.cs	(working copy)
-@@ -81,7 +81,7 @@
-         Device[] DeviceList;
-         IntPtr[] DeviceIDs;
- 
--        protected HashSet<string> ExtensionHashSet = new HashSet<string>();
-+        protected List<string> ExtensionHashSet = new List<string>();
-         protected Dictionary<string, Extension> extensionSupport = new Dictionary<string, Extension>();
-         DirectX9Extension DirectX9Extension;
-         DirectX10Extension DirectX10Extension;
-Index: source/Sampler.cs
-===================================================================
---- source/Sampler.cs	(revision 133)
-+++ source/Sampler.cs	(working copy)
-@@ -25,7 +25,6 @@
- 
- using System;
- using System.Collections.Generic;
--using System.Linq;
- using System.Text;
- 
- namespace OpenCLNet
-Index: source/SimpleOCLHelper.cs
-===================================================================
---- source/SimpleOCLHelper.cs	(revision 133)
-+++ source/SimpleOCLHelper.cs	(working copy)
-@@ -25,7 +25,6 @@
- 
- using System;
- using System.Collections.Generic;
--using System.Linq;
- using System.Text;
- 
- namespace OpenCLNet