aboutsummaryrefslogtreecommitdiffstatsci
diff options
context:
space:
mode:
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>2019-09-10 15:31:13 +0200
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>2019-09-10 15:31:13 +0200
commit89b0adc15bcab82cda4abec15917327f9a9b4f4d (patch)
tree6ce8f167ebd5ce09b2c2124a1752d127c6e3ffe9
parent5377912f8e60cfe6138e606caa3b4051e700e5b3 (diff)
update licence header
-rw-r--r--VK/BindingsHelpers.cs22
-rw-r--r--VK/CalliRewriteAttribute.cs6
-rw-r--r--VK/Commands.cs5
-rw-r--r--VK/Delegates.cs5
-rw-r--r--VK/ExternalTypes.cs5
-rw-r--r--VK/Kernel32.cs5
-rw-r--r--VK/Libdl.cs5
-rw-r--r--VK/Structs.cs27
-rw-r--r--VK/VkBool32.cs4
-rw-r--r--VK/VkRect2D.cs4
-rw-r--r--VK/vulkan.csproj1
-rw-r--r--netfx.props27
-rw-r--r--vk.generator/vk.generator.csproj3
-rw-r--r--vk.rewrite/Program.cs4
-rw-r--r--vk.rewrite/vk.rewrite.csproj1
15 files changed, 39 insertions, 85 deletions
diff --git a/VK/BindingsHelpers.cs b/VK/BindingsHelpers.cs
index 45ba40a..4467d46 100644
--- a/VK/BindingsHelpers.cs
+++ b/VK/BindingsHelpers.cs
@@ -29,26 +29,4 @@ namespace VK {
{
public IntPtr Handle;
}
- //public partial struct VkQueue
- //{
- // unsafe public VkResult submit (VkCommandBuffer cmd, VkSemaphore waitSemaphore, VkSemaphore signalSemaphore, VkFence waitFence)
- // {
- // VkSubmitInfo submitInfo = VkSubmitInfo.New ();
- // VkPipelineStageFlags waitStageMask = VkPipelineStageFlags.ColorAttachmentOutput;
- // submitInfo.pWaitDstStageMask = &waitStageMask;
- // var pcs = waitSemaphore;
- // submitInfo.pWaitSemaphores = &pcs;
- // submitInfo.waitSemaphoreCount = 1;
- // var rcs = signalSemaphore;
- // submitInfo.pSignalSemaphores = &rcs;
- // submitInfo.signalSemaphoreCount = 1;
- // var cmdBuf = &cmd;
- // submitInfo.pCommandBuffers = cmdBuf;
- // submitInfo.commandBufferCount = 1;
-
- // // Submit to the graphics queue passing a wait fence
- // return vkQueueSubmit (this, 1, ref submitInfo, waitFence);
-
- // }
- //}
}
diff --git a/VK/CalliRewriteAttribute.cs b/VK/CalliRewriteAttribute.cs
index 1189678..29f7b35 100644
--- a/VK/CalliRewriteAttribute.cs
+++ b/VK/CalliRewriteAttribute.cs
@@ -1,4 +1,8 @@
-using System;
+// Copyright (c) 2017 Eric Mellino
+// Copyright (c) 2019 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
namespace VK.Generator
{
diff --git a/VK/Commands.cs b/VK/Commands.cs
index 8fa5bf0..1b81e34 100644
--- a/VK/Commands.cs
+++ b/VK/Commands.cs
@@ -1,4 +1,7 @@
-/* credit to https://github.com/mellinoe */
+// Copyright (c) 2017 Eric Mellino
+// Copyright (c) 2019 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
using System;
using System.Diagnostics;
using System.IO;
diff --git a/VK/Delegates.cs b/VK/Delegates.cs
index d400542..8feef9f 100644
--- a/VK/Delegates.cs
+++ b/VK/Delegates.cs
@@ -1,4 +1,7 @@
-/* credit to https://github.com/mellinoe */
+// Copyright (c) 2017 Eric Mellino
+// Copyright (c) 2019 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
using System;
namespace VK
diff --git a/VK/ExternalTypes.cs b/VK/ExternalTypes.cs
index 1515dc0..fe2b643 100644
--- a/VK/ExternalTypes.cs
+++ b/VK/ExternalTypes.cs
@@ -1,4 +1,7 @@
-/* credit to https://github.com/mellinoe */
+// Copyright (c) 2017 Eric Mellino
+// Copyright (c) 2019 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
using System;
namespace VK
diff --git a/VK/Kernel32.cs b/VK/Kernel32.cs
index 6454662..327b14b 100644
--- a/VK/Kernel32.cs
+++ b/VK/Kernel32.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) 2017 Eric Mellino
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
using System.Runtime.InteropServices;
namespace VK
diff --git a/VK/Libdl.cs b/VK/Libdl.cs
index 49e3351..c268dfa 100644
--- a/VK/Libdl.cs
+++ b/VK/Libdl.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) 2017 Eric Mellino
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
using System.Runtime.InteropServices;
namespace VK
diff --git a/VK/Structs.cs b/VK/Structs.cs
index ae35873..4d4594a 100644
--- a/VK/Structs.cs
+++ b/VK/Structs.cs
@@ -1,28 +1,7 @@
-//
-// Structs.cs
+// Copyright (c) 2017 Eric Mellino
+// Copyright (c) 2019 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
//
-// Author:
-// Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
-//
-// Copyright (c) 2019 jp
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
using System;
using System.Runtime.InteropServices;
diff --git a/VK/VkBool32.cs b/VK/VkBool32.cs
index 577cdc6..867d591 100644
--- a/VK/VkBool32.cs
+++ b/VK/VkBool32.cs
@@ -1,4 +1,6 @@
-/* credit to https://github.com/mellinoe */
+// Copyright (c) 2017 Eric Mellino
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
using System;
namespace VK
diff --git a/VK/VkRect2D.cs b/VK/VkRect2D.cs
index 4548cb7..6480ca4 100644
--- a/VK/VkRect2D.cs
+++ b/VK/VkRect2D.cs
@@ -1,4 +1,6 @@
-/* credit to https://github.com/mellinoe */
+// Copyright (c) 2017 Eric Mellino
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
using System;
using System.Collections.Generic;
using System.Text;
diff --git a/VK/vulkan.csproj b/VK/vulkan.csproj
index 91de626..3c2a4cb 100644
--- a/VK/vulkan.csproj
+++ b/VK/vulkan.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="$(RootDirectory)netfx.props" />
<PropertyGroup>
<Copyright></Copyright>
<AssemblyVersion>0.1.5</AssemblyVersion>
diff --git a/netfx.props b/netfx.props
deleted file mode 100644
index 25fdbe0..0000000
--- a/netfx.props
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <!-- When compiling .NET SDK 2.0 projects targeting .NET 4.x on Mono using 'dotnet build' you -->
- <!-- have to teach MSBuild where the Mono copy of the reference asssemblies is -->
- <TargetIsMono Condition="$(TargetFramework.StartsWith('net4')) and '$(OS)' == 'Unix'">true</TargetIsMono>
-
- <!-- Look in the standard install locations -->
- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono</BaseFrameworkPathOverrideForMono>
- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/lib/mono')">/usr/lib/mono</BaseFrameworkPathOverrideForMono>
- <BaseFrameworkPathOverrideForMono Condition="'$(BaseFrameworkPathOverrideForMono)' == '' AND '$(TargetIsMono)' == 'true' AND EXISTS('/usr/local/lib/mono')">/usr/local/lib/mono</BaseFrameworkPathOverrideForMono>
-
- <!-- If we found Mono reference assemblies, then use them -->
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net45'">$(BaseFrameworkPathOverrideForMono)/4.5-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net451'">$(BaseFrameworkPathOverrideForMono)/4.5.1-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net452'">$(BaseFrameworkPathOverrideForMono)/4.5.2-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net46'">$(BaseFrameworkPathOverrideForMono)/4.6-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net461'">$(BaseFrameworkPathOverrideForMono)/4.6.1-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net462'">$(BaseFrameworkPathOverrideForMono)/4.6.2-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net47'">$(BaseFrameworkPathOverrideForMono)/4.7-api</FrameworkPathOverride>
- <FrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != '' AND '$(TargetFramework)' == 'net471'">$(BaseFrameworkPathOverrideForMono)/4.7.1-api</FrameworkPathOverride>
- <EnableFrameworkPathOverride Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">true</EnableFrameworkPathOverride>
-
- <!-- Add the Facades directory. Not sure how else to do this. Necessary at least for .NET 4.5 -->
- <AssemblySearchPaths Condition="'$(BaseFrameworkPathOverrideForMono)' != ''">$(FrameworkPathOverride)/Facades;$(AssemblySearchPaths)</AssemblySearchPaths>
- </PropertyGroup>
-</Project>
-
diff --git a/vk.generator/vk.generator.csproj b/vk.generator/vk.generator.csproj
index 00dbf3c..efa8340 100644
--- a/vk.generator/vk.generator.csproj
+++ b/vk.generator/vk.generator.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="$(RootDirectory)netfx.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -13,4 +12,4 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
-</Project> \ No newline at end of file
+</Project>
diff --git a/vk.rewrite/Program.cs b/vk.rewrite/Program.cs
index 2935e0f..3f238ea 100644
--- a/vk.rewrite/Program.cs
+++ b/vk.rewrite/Program.cs
@@ -1,3 +1,7 @@
+// Copyright (c) 2017 Eric Mellino
+// Copyright (c) 2019 Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
using Mono.Cecil;
using Mono.Cecil.Cil;
using System;
diff --git a/vk.rewrite/vk.rewrite.csproj b/vk.rewrite/vk.rewrite.csproj
index d54b4ed..e668f32 100644
--- a/vk.rewrite/vk.rewrite.csproj
+++ b/vk.rewrite/vk.rewrite.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="$(RootDirectory)netfx.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>