diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2019-08-30 07:11:09 +0200 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2019-08-30 07:11:09 +0200 |
| commit | 42ac5bf623489be793424b281412e17f71d63cf4 (patch) | |
| tree | b671d024007f33aed89cc13884520dd42e5fd067 | |
| parent | d0db024245eabd52bdaa419b10f53c1a7e4b2447 (diff) | |
rename vke directory to CVKL
| -rw-r--r-- | CVKL.Addons/Directory.Build.props | 2 | ||||
| -rw-r--r-- | CVKL/CVKL.csproj (renamed from vke/CVKL.csproj) | 0 | ||||
| l--------- | CVKL/netfx.props (renamed from vke/netfx.props) | 0 | ||||
| -rw-r--r-- | CVKL/shaders/FullScreenQuad.vert (renamed from vke/shaders/FullScreenQuad.vert) | 0 | ||||
| -rw-r--r-- | CVKL/shaders/simpletexture.frag (renamed from vke/shaders/simpletexture.frag) | 0 | ||||
| -rw-r--r-- | CVKL/src/Camera.cs (renamed from vke/src/Camera.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/ExtensionMethods.cs (renamed from vke/src/ExtensionMethods.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/FixedUtf8String.cs (renamed from vke/src/FixedUtf8String.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/MarshaledObject.cs (renamed from vke/src/MarshaledObject.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/MemoryPool.cs (renamed from vke/src/MemoryPool.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/ResourceManager.cs (renamed from vke/src/ResourceManager.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/ShaderInfo.cs (renamed from vke/src/ShaderInfo.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/SpecializationConstant.cs (renamed from vke/src/SpecializationConstant.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/StbImage.cs (renamed from vke/src/StbImage.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/Utils.cs (renamed from vke/src/Utils.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/Version.cs (renamed from vke/src/Version.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/VertexAttribute.cs (renamed from vke/src/VertexAttribute.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/VkFormatSize.cs (renamed from vke/src/VkFormatSize.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/VkWindow.cs (renamed from vke/src/VkWindow.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/Activable.cs (renamed from vke/src/base/Activable.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/Buffer.cs (renamed from vke/src/base/Buffer.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/CommandBuffer.cs (renamed from vke/src/base/CommandBuffer.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/CommandPool.cs (renamed from vke/src/base/CommandPool.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/ComputePipeline.cs (renamed from vke/src/base/ComputePipeline.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/DebuDrawPipeline.cs (renamed from vke/src/base/DebuDrawPipeline.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/DebugReport.cs (renamed from vke/src/base/DebugReport.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/DebugUtilsMessenger.cs (renamed from vke/src/base/DebugUtilsMessenger.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/DescriptorPool.cs (renamed from vke/src/base/DescriptorPool.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/DescriptorSet.cs (renamed from vke/src/base/DescriptorSet.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/DescriptorSetLayout.cs (renamed from vke/src/base/DescriptorSetLayout.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/DescriptorSetWrites.cs (renamed from vke/src/base/DescriptorSetWrites.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/Device.cs (renamed from vke/src/base/Device.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/FrameBuffer.cs (renamed from vke/src/base/FrameBuffer.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/GPUBuffer.cs (renamed from vke/src/base/GPUBuffer.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/GraphicPipeline.cs (renamed from vke/src/base/GraphicPipeline.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/GraphicPipelineConfig.cs (renamed from vke/src/base/GraphicPipelineConfig.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/HostBuffer.cs (renamed from vke/src/base/HostBuffer.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/Image.cs (renamed from vke/src/base/Image.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/Instance.cs (renamed from vke/src/base/Instance.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/PhysicalDevice.cs (renamed from vke/src/base/PhysicalDevice.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/Pipeline.cs (renamed from vke/src/base/Pipeline.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/PipelineCache.cs (renamed from vke/src/base/PipelineCache.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/PipelineLayout.cs (renamed from vke/src/base/PipelineLayout.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/QueryPool.cs (renamed from vke/src/base/QueryPool.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/Queue.cs (renamed from vke/src/base/Queue.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/RenderPass.cs (renamed from vke/src/base/RenderPass.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/Resource.cs (renamed from vke/src/base/Resource.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/SubPass.cs (renamed from vke/src/base/SubPass.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/base/SwapChain.cs (renamed from vke/src/base/SwapChain.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/gl.cs (renamed from vke/src/gl.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/CodePoint.cs (renamed from vke/src/glfw/CodePoint.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/Delegates.cs (renamed from vke/src/glfw/Delegates.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/ErrorCode.cs (renamed from vke/src/glfw/ErrorCode.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/Glfw3.cs (renamed from vke/src/glfw/Glfw3.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/InputAction.cs (renamed from vke/src/glfw/InputAction.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/Key.cs (renamed from vke/src/glfw/Key.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/Modifier.cs (renamed from vke/src/glfw/Modifier.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/MonitorEvent.cs (renamed from vke/src/glfw/MonitorEvent.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/MonitorHandle.cs (renamed from vke/src/glfw/MonitorHandle.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/MouseButton.cs (renamed from vke/src/glfw/MouseButton.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/NativeString.cs (renamed from vke/src/glfw/NativeString.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/VideoMode.cs (renamed from vke/src/glfw/VideoMode.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/VideoModePointer.cs (renamed from vke/src/glfw/VideoModePointer.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/glfw/WindowAttribute.cs (renamed from vke/src/glfw/WindowAttribute.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/ktx.cs (renamed from vke/src/ktx.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/model/BoundingBox.cs (renamed from vke/src/model/BoundingBox.cs) | 0 | ||||
| -rw-r--r-- | CVKL/src/model/Model.cs (renamed from vke/src/model/Model.cs) | 0 | ||||
| -rw-r--r-- | SpirVTasks/README.md | 33 | ||||
| -rw-r--r-- | samples/Directory.Build.props | 2 | ||||
| -rw-r--r-- | vk.net.sln | 2 |
70 files changed, 17 insertions, 22 deletions
diff --git a/CVKL.Addons/Directory.Build.props b/CVKL.Addons/Directory.Build.props index 57d68f7..93b5a7f 100644 --- a/CVKL.Addons/Directory.Build.props +++ b/CVKL.Addons/Directory.Build.props @@ -27,7 +27,7 @@ </PropertyGroup> <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <ProjectReference Include="$(RootDirectory)vke\CVKL.csproj" /> + <ProjectReference Include="$(RootDirectory)CVKL\CVKL.csproj" /> </ItemGroup> <ItemGroup > <PackageReference Include="CVKL" Version="0.1.7-beta" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/> diff --git a/vke/CVKL.csproj b/CVKL/CVKL.csproj index 443ed77..443ed77 100644 --- a/vke/CVKL.csproj +++ b/CVKL/CVKL.csproj diff --git a/vke/netfx.props b/CVKL/netfx.props index 728e74b..728e74b 120000 --- a/vke/netfx.props +++ b/CVKL/netfx.props diff --git a/vke/shaders/FullScreenQuad.vert b/CVKL/shaders/FullScreenQuad.vert index 826720b..826720b 100644 --- a/vke/shaders/FullScreenQuad.vert +++ b/CVKL/shaders/FullScreenQuad.vert diff --git a/vke/shaders/simpletexture.frag b/CVKL/shaders/simpletexture.frag index cee63cb..cee63cb 100644 --- a/vke/shaders/simpletexture.frag +++ b/CVKL/shaders/simpletexture.frag diff --git a/vke/src/Camera.cs b/CVKL/src/Camera.cs index 0410e0e..0410e0e 100644 --- a/vke/src/Camera.cs +++ b/CVKL/src/Camera.cs diff --git a/vke/src/ExtensionMethods.cs b/CVKL/src/ExtensionMethods.cs index 287e887..287e887 100644 --- a/vke/src/ExtensionMethods.cs +++ b/CVKL/src/ExtensionMethods.cs diff --git a/vke/src/FixedUtf8String.cs b/CVKL/src/FixedUtf8String.cs index 7b3d7a6..7b3d7a6 100644 --- a/vke/src/FixedUtf8String.cs +++ b/CVKL/src/FixedUtf8String.cs diff --git a/vke/src/MarshaledObject.cs b/CVKL/src/MarshaledObject.cs index 6116071..6116071 100644 --- a/vke/src/MarshaledObject.cs +++ b/CVKL/src/MarshaledObject.cs diff --git a/vke/src/MemoryPool.cs b/CVKL/src/MemoryPool.cs index 1c5e3ab..1c5e3ab 100644 --- a/vke/src/MemoryPool.cs +++ b/CVKL/src/MemoryPool.cs diff --git a/vke/src/ResourceManager.cs b/CVKL/src/ResourceManager.cs index e450754..e450754 100644 --- a/vke/src/ResourceManager.cs +++ b/CVKL/src/ResourceManager.cs diff --git a/vke/src/ShaderInfo.cs b/CVKL/src/ShaderInfo.cs index f523f06..f523f06 100644 --- a/vke/src/ShaderInfo.cs +++ b/CVKL/src/ShaderInfo.cs diff --git a/vke/src/SpecializationConstant.cs b/CVKL/src/SpecializationConstant.cs index b455cca..b455cca 100644 --- a/vke/src/SpecializationConstant.cs +++ b/CVKL/src/SpecializationConstant.cs diff --git a/vke/src/StbImage.cs b/CVKL/src/StbImage.cs index 3ea1d7f..3ea1d7f 100644 --- a/vke/src/StbImage.cs +++ b/CVKL/src/StbImage.cs diff --git a/vke/src/Utils.cs b/CVKL/src/Utils.cs index bd6c7a3..bd6c7a3 100644 --- a/vke/src/Utils.cs +++ b/CVKL/src/Utils.cs diff --git a/vke/src/Version.cs b/CVKL/src/Version.cs index ed71d20..ed71d20 100644 --- a/vke/src/Version.cs +++ b/CVKL/src/Version.cs diff --git a/vke/src/VertexAttribute.cs b/CVKL/src/VertexAttribute.cs index 75bf5df..75bf5df 100644 --- a/vke/src/VertexAttribute.cs +++ b/CVKL/src/VertexAttribute.cs diff --git a/vke/src/VkFormatSize.cs b/CVKL/src/VkFormatSize.cs index 75e815d..75e815d 100644 --- a/vke/src/VkFormatSize.cs +++ b/CVKL/src/VkFormatSize.cs diff --git a/vke/src/VkWindow.cs b/CVKL/src/VkWindow.cs index 3b2b953..3b2b953 100644 --- a/vke/src/VkWindow.cs +++ b/CVKL/src/VkWindow.cs diff --git a/vke/src/base/Activable.cs b/CVKL/src/base/Activable.cs index b77443c..b77443c 100644 --- a/vke/src/base/Activable.cs +++ b/CVKL/src/base/Activable.cs diff --git a/vke/src/base/Buffer.cs b/CVKL/src/base/Buffer.cs index 254d547..254d547 100644 --- a/vke/src/base/Buffer.cs +++ b/CVKL/src/base/Buffer.cs diff --git a/vke/src/base/CommandBuffer.cs b/CVKL/src/base/CommandBuffer.cs index 0c381a7..0c381a7 100644 --- a/vke/src/base/CommandBuffer.cs +++ b/CVKL/src/base/CommandBuffer.cs diff --git a/vke/src/base/CommandPool.cs b/CVKL/src/base/CommandPool.cs index 3317733..3317733 100644 --- a/vke/src/base/CommandPool.cs +++ b/CVKL/src/base/CommandPool.cs diff --git a/vke/src/base/ComputePipeline.cs b/CVKL/src/base/ComputePipeline.cs index e57a7d0..e57a7d0 100644 --- a/vke/src/base/ComputePipeline.cs +++ b/CVKL/src/base/ComputePipeline.cs diff --git a/vke/src/base/DebuDrawPipeline.cs b/CVKL/src/base/DebuDrawPipeline.cs index c974416..c974416 100644 --- a/vke/src/base/DebuDrawPipeline.cs +++ b/CVKL/src/base/DebuDrawPipeline.cs diff --git a/vke/src/base/DebugReport.cs b/CVKL/src/base/DebugReport.cs index 3bda80b..3bda80b 100644 --- a/vke/src/base/DebugReport.cs +++ b/CVKL/src/base/DebugReport.cs diff --git a/vke/src/base/DebugUtilsMessenger.cs b/CVKL/src/base/DebugUtilsMessenger.cs index b048c36..b048c36 100644 --- a/vke/src/base/DebugUtilsMessenger.cs +++ b/CVKL/src/base/DebugUtilsMessenger.cs diff --git a/vke/src/base/DescriptorPool.cs b/CVKL/src/base/DescriptorPool.cs index 6c9f9c4..6c9f9c4 100644 --- a/vke/src/base/DescriptorPool.cs +++ b/CVKL/src/base/DescriptorPool.cs diff --git a/vke/src/base/DescriptorSet.cs b/CVKL/src/base/DescriptorSet.cs index 19b231c..19b231c 100644 --- a/vke/src/base/DescriptorSet.cs +++ b/CVKL/src/base/DescriptorSet.cs diff --git a/vke/src/base/DescriptorSetLayout.cs b/CVKL/src/base/DescriptorSetLayout.cs index f63e5e2..f63e5e2 100644 --- a/vke/src/base/DescriptorSetLayout.cs +++ b/CVKL/src/base/DescriptorSetLayout.cs diff --git a/vke/src/base/DescriptorSetWrites.cs b/CVKL/src/base/DescriptorSetWrites.cs index f9f1adf..f9f1adf 100644 --- a/vke/src/base/DescriptorSetWrites.cs +++ b/CVKL/src/base/DescriptorSetWrites.cs diff --git a/vke/src/base/Device.cs b/CVKL/src/base/Device.cs index 1bb9e09..1bb9e09 100644 --- a/vke/src/base/Device.cs +++ b/CVKL/src/base/Device.cs diff --git a/vke/src/base/FrameBuffer.cs b/CVKL/src/base/FrameBuffer.cs index 2f668e0..2f668e0 100644 --- a/vke/src/base/FrameBuffer.cs +++ b/CVKL/src/base/FrameBuffer.cs diff --git a/vke/src/base/GPUBuffer.cs b/CVKL/src/base/GPUBuffer.cs index 61504fd..61504fd 100644 --- a/vke/src/base/GPUBuffer.cs +++ b/CVKL/src/base/GPUBuffer.cs diff --git a/vke/src/base/GraphicPipeline.cs b/CVKL/src/base/GraphicPipeline.cs index 562e4fa..562e4fa 100644 --- a/vke/src/base/GraphicPipeline.cs +++ b/CVKL/src/base/GraphicPipeline.cs diff --git a/vke/src/base/GraphicPipelineConfig.cs b/CVKL/src/base/GraphicPipelineConfig.cs index 6ccd3f2..6ccd3f2 100644 --- a/vke/src/base/GraphicPipelineConfig.cs +++ b/CVKL/src/base/GraphicPipelineConfig.cs diff --git a/vke/src/base/HostBuffer.cs b/CVKL/src/base/HostBuffer.cs index 20734c8..20734c8 100644 --- a/vke/src/base/HostBuffer.cs +++ b/CVKL/src/base/HostBuffer.cs diff --git a/vke/src/base/Image.cs b/CVKL/src/base/Image.cs index 3787e3c..3787e3c 100644 --- a/vke/src/base/Image.cs +++ b/CVKL/src/base/Image.cs diff --git a/vke/src/base/Instance.cs b/CVKL/src/base/Instance.cs index d8a06d3..d8a06d3 100644 --- a/vke/src/base/Instance.cs +++ b/CVKL/src/base/Instance.cs diff --git a/vke/src/base/PhysicalDevice.cs b/CVKL/src/base/PhysicalDevice.cs index 265c6fa..265c6fa 100644 --- a/vke/src/base/PhysicalDevice.cs +++ b/CVKL/src/base/PhysicalDevice.cs diff --git a/vke/src/base/Pipeline.cs b/CVKL/src/base/Pipeline.cs index 3e6eac3..3e6eac3 100644 --- a/vke/src/base/Pipeline.cs +++ b/CVKL/src/base/Pipeline.cs diff --git a/vke/src/base/PipelineCache.cs b/CVKL/src/base/PipelineCache.cs index c139696..c139696 100644 --- a/vke/src/base/PipelineCache.cs +++ b/CVKL/src/base/PipelineCache.cs diff --git a/vke/src/base/PipelineLayout.cs b/CVKL/src/base/PipelineLayout.cs index 1c59f90..1c59f90 100644 --- a/vke/src/base/PipelineLayout.cs +++ b/CVKL/src/base/PipelineLayout.cs diff --git a/vke/src/base/QueryPool.cs b/CVKL/src/base/QueryPool.cs index 1d95174..1d95174 100644 --- a/vke/src/base/QueryPool.cs +++ b/CVKL/src/base/QueryPool.cs diff --git a/vke/src/base/Queue.cs b/CVKL/src/base/Queue.cs index b463ba6..b463ba6 100644 --- a/vke/src/base/Queue.cs +++ b/CVKL/src/base/Queue.cs diff --git a/vke/src/base/RenderPass.cs b/CVKL/src/base/RenderPass.cs index 773c436..773c436 100644 --- a/vke/src/base/RenderPass.cs +++ b/CVKL/src/base/RenderPass.cs diff --git a/vke/src/base/Resource.cs b/CVKL/src/base/Resource.cs index f5b4c87..f5b4c87 100644 --- a/vke/src/base/Resource.cs +++ b/CVKL/src/base/Resource.cs diff --git a/vke/src/base/SubPass.cs b/CVKL/src/base/SubPass.cs index 2396cdb..2396cdb 100644 --- a/vke/src/base/SubPass.cs +++ b/CVKL/src/base/SubPass.cs diff --git a/vke/src/base/SwapChain.cs b/CVKL/src/base/SwapChain.cs index d691ea8..d691ea8 100644 --- a/vke/src/base/SwapChain.cs +++ b/CVKL/src/base/SwapChain.cs diff --git a/vke/src/gl.cs b/CVKL/src/gl.cs index 89de221..89de221 100644 --- a/vke/src/gl.cs +++ b/CVKL/src/gl.cs diff --git a/vke/src/glfw/CodePoint.cs b/CVKL/src/glfw/CodePoint.cs index 142dbc7..142dbc7 100644 --- a/vke/src/glfw/CodePoint.cs +++ b/CVKL/src/glfw/CodePoint.cs diff --git a/vke/src/glfw/Delegates.cs b/CVKL/src/glfw/Delegates.cs index 2f2acb6..2f2acb6 100644 --- a/vke/src/glfw/Delegates.cs +++ b/CVKL/src/glfw/Delegates.cs diff --git a/vke/src/glfw/ErrorCode.cs b/CVKL/src/glfw/ErrorCode.cs index c757488..c757488 100644 --- a/vke/src/glfw/ErrorCode.cs +++ b/CVKL/src/glfw/ErrorCode.cs diff --git a/vke/src/glfw/Glfw3.cs b/CVKL/src/glfw/Glfw3.cs index 27e7497..27e7497 100644 --- a/vke/src/glfw/Glfw3.cs +++ b/CVKL/src/glfw/Glfw3.cs diff --git a/vke/src/glfw/InputAction.cs b/CVKL/src/glfw/InputAction.cs index a0f7ee3..a0f7ee3 100644 --- a/vke/src/glfw/InputAction.cs +++ b/CVKL/src/glfw/InputAction.cs diff --git a/vke/src/glfw/Key.cs b/CVKL/src/glfw/Key.cs index 0cc2a64..0cc2a64 100644 --- a/vke/src/glfw/Key.cs +++ b/CVKL/src/glfw/Key.cs diff --git a/vke/src/glfw/Modifier.cs b/CVKL/src/glfw/Modifier.cs index 55da485..55da485 100644 --- a/vke/src/glfw/Modifier.cs +++ b/CVKL/src/glfw/Modifier.cs diff --git a/vke/src/glfw/MonitorEvent.cs b/CVKL/src/glfw/MonitorEvent.cs index 340ba6e..340ba6e 100644 --- a/vke/src/glfw/MonitorEvent.cs +++ b/CVKL/src/glfw/MonitorEvent.cs diff --git a/vke/src/glfw/MonitorHandle.cs b/CVKL/src/glfw/MonitorHandle.cs index 16b8a71..16b8a71 100644 --- a/vke/src/glfw/MonitorHandle.cs +++ b/CVKL/src/glfw/MonitorHandle.cs diff --git a/vke/src/glfw/MouseButton.cs b/CVKL/src/glfw/MouseButton.cs index 12425ad..12425ad 100644 --- a/vke/src/glfw/MouseButton.cs +++ b/CVKL/src/glfw/MouseButton.cs diff --git a/vke/src/glfw/NativeString.cs b/CVKL/src/glfw/NativeString.cs index f191e33..f191e33 100644 --- a/vke/src/glfw/NativeString.cs +++ b/CVKL/src/glfw/NativeString.cs diff --git a/vke/src/glfw/VideoMode.cs b/CVKL/src/glfw/VideoMode.cs index 8a60269..8a60269 100644 --- a/vke/src/glfw/VideoMode.cs +++ b/CVKL/src/glfw/VideoMode.cs diff --git a/vke/src/glfw/VideoModePointer.cs b/CVKL/src/glfw/VideoModePointer.cs index e740772..e740772 100644 --- a/vke/src/glfw/VideoModePointer.cs +++ b/CVKL/src/glfw/VideoModePointer.cs diff --git a/vke/src/glfw/WindowAttribute.cs b/CVKL/src/glfw/WindowAttribute.cs index 5d862af..5d862af 100644 --- a/vke/src/glfw/WindowAttribute.cs +++ b/CVKL/src/glfw/WindowAttribute.cs diff --git a/vke/src/ktx.cs b/CVKL/src/ktx.cs index cc68854..cc68854 100644 --- a/vke/src/ktx.cs +++ b/CVKL/src/ktx.cs diff --git a/vke/src/model/BoundingBox.cs b/CVKL/src/model/BoundingBox.cs index 07747c8..07747c8 100644 --- a/vke/src/model/BoundingBox.cs +++ b/CVKL/src/model/BoundingBox.cs diff --git a/vke/src/model/Model.cs b/CVKL/src/model/Model.cs index 0bc56e8..0bc56e8 100644 --- a/vke/src/model/Model.cs +++ b/CVKL/src/model/Model.cs diff --git a/SpirVTasks/README.md b/SpirVTasks/README.md index 7b2fdb4..3495865 100644 --- a/SpirVTasks/README.md +++ b/SpirVTasks/README.md @@ -12,9 +12,9 @@ </h1> **SpirVTasks** package add **SpirV** compilation support to msbuild project. Error and warning -are transmited to the **IDE**. +are routed to the **IDE**. -Add glsl files to your project with the **`<GLSLShader>`** tag. +#### Usage ```xml <ItemGroup> @@ -22,9 +22,7 @@ Add glsl files to your project with the **`<GLSLShader>`** tag. </ItemGroup> ``` -Resulting `.spv` files will be embedded with the resource ID = ProjectName.file.ext.spv. -You can override the resource name by adding a **`<LogicalName>`** element. - +Resulting `.spv` files are embedded with resource ID = **ProjectName.file.ext.spv**. You can override the default resource id by adding a custom LogicalName. ```xml <ItemGroup> <GLSLShader Include="shaders\skybox.vert"> @@ -32,24 +30,13 @@ You can override the resource name by adding a **`<LogicalName>`** element. </GLSLShader> </ItemGroup> ``` -**glslc** executable is searched with the help of the **VULKAN_SDK** or **PATH** environments variables. -You may also point to glslc with the **`<SpirVglslcPath>`** property (>= 0.1.7), but if the property is set. - +**VULKAN_SDK**/bin then **PATH** are searched for the **glslc** executable. You can also use **`SpirVglslcPath`** property. ```xml <PropertyGroup> <SpirVglslcPath>bin\glslc.exe</SpirVglslcPath> </PropertyGroup> ``` - -I've added an **include** mechanism for glsl, file are searched from the location of the current parsed file, -then in the **`<SpirVAdditionalIncludeDirectories>`** directories property. - -```xml -<PropertyGroup> - <SpirVAdditionalIncludeDirectories>$(MSBuildThisFileDirectory)common\</SpirVAdditionalIncludeDirectories> -</PropertyGroup> -``` - +#### Include in glsl ```glsl #include <preamble.inc> @@ -62,6 +49,14 @@ void main() } ``` -TODO: +Included files are searched from the location of the current parsed file, then in the **`<SpirVAdditionalIncludeDirectories>`** directories if present. + +```xml +<PropertyGroup> + <SpirVAdditionalIncludeDirectories>$(MSBuildThisFileDirectory)common;testdir;../anotherdir</SpirVAdditionalIncludeDirectories> +</PropertyGroup> +``` + +#### todo - Error source file and line with included files. diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index dc4c42e..2c30df4 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -26,7 +26,7 @@ </PropertyGroup> <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <ProjectReference Include="$(RootDirectory)vke\CVKL.csproj" /> + <ProjectReference Include="$(RootDirectory)CVKL\CVKL.csproj" /> </ItemGroup> <ItemGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PackageReference Include="CVKL" Version="0.1.7-beta" /> @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{A2A2849A-0032-4AA8-BC0E-82C69D7DE354}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CVKL", "vke\CVKL.csproj", "{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CVKL", "CVKL\CVKL.csproj", "{9E12DFE6-7DC7-4BF2-8077-42DDC69FD0A1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpirVTasks", "SpirVTasks\SpirVTasks.csproj", "{F72F73E4-86CC-4F56-B004-BCC4BF0AF30B}" EndProject |