From 45590a9bd77e0ca925ebdca834114e96851d990d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Tue, 19 Mar 2019 15:35:08 +0100 Subject: [PATCH] Change include paths and argument type on main functions to ease linux adoption (#307) --- samples/01_InitInstance/01_InitInstance.cpp | 2 +- samples/02_EnumerateDevices/02_EnumerateDevices.cpp | 4 ++-- samples/03_InitDevice/03_InitDevice.cpp | 4 ++-- samples/04_InitCommandBuffer/04_InitCommandBuffer.cpp | 4 ++-- samples/05_InitSwapchain/05_InitSwapchain.cpp | 4 ++-- samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp | 4 ++-- samples/07_InitUniformBuffer/07_InitUniformBuffer.cpp | 4 ++-- samples/08_InitPipelineLayout/08_InitPipelineLayout.cpp | 4 ++-- samples/09_InitDescriptorSet/09_InitDescriptorSet.cpp | 4 ++-- samples/10_InitRenderPass/10_InitRenderPass.cpp | 4 ++-- samples/11_InitShaders/11_InitShaders.cpp | 6 +++--- samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp | 2 +- samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp | 2 +- samples/14_InitPipeline/14_InitPipeline.cpp | 2 +- samples/15_DrawCube/15_DrawCube.cpp | 2 +- tests/DeviceFunctions/DeviceFunctions.cpp | 2 +- tests/DispatchLoaderDynamic/DispatchLoaderDynamic.cpp | 2 +- tests/NoExceptions/NoExceptions.cpp | 2 +- tests/StructureChain/StructureChain.cpp | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/samples/01_InitInstance/01_InitInstance.cpp b/samples/01_InitInstance/01_InitInstance.cpp index ed4a716..dd56660 100644 --- a/samples/01_InitInstance/01_InitInstance.cpp +++ b/samples/01_InitInstance/01_InitInstance.cpp @@ -21,7 +21,7 @@ static char const* AppName = "01_InitInstance"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { /* VULKAN_HPP_KEY_START */ diff --git a/samples/02_EnumerateDevices/02_EnumerateDevices.cpp b/samples/02_EnumerateDevices/02_EnumerateDevices.cpp index 461dc68..d92d9d2 100644 --- a/samples/02_EnumerateDevices/02_EnumerateDevices.cpp +++ b/samples/02_EnumerateDevices/02_EnumerateDevices.cpp @@ -15,14 +15,14 @@ // VulkanHpp Samples : 02_EnumerateDevices // Enumerate physical devices -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include static char const* AppName = "02_EnumerateDevices"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/03_InitDevice/03_InitDevice.cpp b/samples/03_InitDevice/03_InitDevice.cpp index f2caa6a..f25e685 100644 --- a/samples/03_InitDevice/03_InitDevice.cpp +++ b/samples/03_InitDevice/03_InitDevice.cpp @@ -15,14 +15,14 @@ // VulkanHpp Samples : 03_InitDevice // Create and destroy a device -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include static char const* AppName = "03_InitDevice"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/04_InitCommandBuffer/04_InitCommandBuffer.cpp b/samples/04_InitCommandBuffer/04_InitCommandBuffer.cpp index 38133c9..709e8dc 100644 --- a/samples/04_InitCommandBuffer/04_InitCommandBuffer.cpp +++ b/samples/04_InitCommandBuffer/04_InitCommandBuffer.cpp @@ -15,14 +15,14 @@ // VulkanHpp Samples : 04_InitCommandBuffer // Create command buffer -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include static char const* AppName = "04_InitCommandBuffer"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/05_InitSwapchain/05_InitSwapchain.cpp b/samples/05_InitSwapchain/05_InitSwapchain.cpp index 4ca3e35..b9fb90e 100644 --- a/samples/05_InitSwapchain/05_InitSwapchain.cpp +++ b/samples/05_InitSwapchain/05_InitSwapchain.cpp @@ -15,14 +15,14 @@ // VulkanHpp Samples : 05_InitSwapchain // Initialize a swapchain -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include static char const* AppName = "05_InitSwapchain"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp b/samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp index ebb85cf..3178ff9 100644 --- a/samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp +++ b/samples/06_InitDepthBuffer/06_InitDepthBuffer.cpp @@ -15,14 +15,14 @@ // VulkanHpp Samples : 06_InitDepthBuffer // Initialize a depth buffer -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include static char const* AppName = "06_InitDepthBuffer"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/07_InitUniformBuffer/07_InitUniformBuffer.cpp b/samples/07_InitUniformBuffer/07_InitUniformBuffer.cpp index aa9e011..b07fdab 100644 --- a/samples/07_InitUniformBuffer/07_InitUniformBuffer.cpp +++ b/samples/07_InitUniformBuffer/07_InitUniformBuffer.cpp @@ -15,7 +15,7 @@ // VulkanHpp Samples : 07_InitUniformBuffer // Initialize a uniform buffer -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include @@ -26,7 +26,7 @@ static char const* AppName = "07_InitUniformBuffer"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/08_InitPipelineLayout/08_InitPipelineLayout.cpp b/samples/08_InitPipelineLayout/08_InitPipelineLayout.cpp index 304c35c..f5ee945 100644 --- a/samples/08_InitPipelineLayout/08_InitPipelineLayout.cpp +++ b/samples/08_InitPipelineLayout/08_InitPipelineLayout.cpp @@ -15,14 +15,14 @@ // VulkanHpp Samples : 08_InitPipelineLayout // Initialize a descriptor and pipeline layout -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include static char const* AppName = "08_InitPipelineLayout"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/09_InitDescriptorSet/09_InitDescriptorSet.cpp b/samples/09_InitDescriptorSet/09_InitDescriptorSet.cpp index 8100b46..08e1116 100644 --- a/samples/09_InitDescriptorSet/09_InitDescriptorSet.cpp +++ b/samples/09_InitDescriptorSet/09_InitDescriptorSet.cpp @@ -15,7 +15,7 @@ // VulkanHpp Samples : 09_InitDescriptorSet // Initialize a descriptor set -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include @@ -26,7 +26,7 @@ static char const* AppName = "09_InitDescriptorSet"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/10_InitRenderPass/10_InitRenderPass.cpp b/samples/10_InitRenderPass/10_InitRenderPass.cpp index 8536320..a2bc07f 100644 --- a/samples/10_InitRenderPass/10_InitRenderPass.cpp +++ b/samples/10_InitRenderPass/10_InitRenderPass.cpp @@ -15,7 +15,7 @@ // VulkanHpp Samples : 10_InitRenderPass // Initialize a render pass -#include "..\utils\utils.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include @@ -26,7 +26,7 @@ static char const* AppName = "10_InitRenderPass"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/11_InitShaders/11_InitShaders.cpp b/samples/11_InitShaders/11_InitShaders.cpp index 49c6242..09f1464 100644 --- a/samples/11_InitShaders/11_InitShaders.cpp +++ b/samples/11_InitShaders/11_InitShaders.cpp @@ -15,8 +15,8 @@ // VulkanHpp Samples : 11_InitShaders // Initialize vertex and fragment shaders -#include "..\utils\shaders.hpp" -#include "..\utils\utils.hpp" +#include "../utils/shaders.hpp" +#include "../utils/utils.hpp" #include "vulkan/vulkan.hpp" #include "SPIRV/GlslangToSpv.h" #include @@ -24,7 +24,7 @@ static char const* AppName = "11_InitShaders"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp b/samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp index 865d160..9510ed1 100644 --- a/samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp +++ b/samples/12_InitFrameBuffers/12_InitFrameBuffers.cpp @@ -22,7 +22,7 @@ static char const* AppName = "12_InitFrameBuffers"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp b/samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp index aef36f4..85c5858 100644 --- a/samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp +++ b/samples/13_InitVertexBuffer/13_InitVertexBuffer.cpp @@ -23,7 +23,7 @@ static char const* AppName = "13_InitVertexBuffer"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/14_InitPipeline/14_InitPipeline.cpp b/samples/14_InitPipeline/14_InitPipeline.cpp index 3f633df..37bdb80 100644 --- a/samples/14_InitPipeline/14_InitPipeline.cpp +++ b/samples/14_InitPipeline/14_InitPipeline.cpp @@ -26,7 +26,7 @@ static char const* AppName = "14_InitPipeline"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/samples/15_DrawCube/15_DrawCube.cpp b/samples/15_DrawCube/15_DrawCube.cpp index ea13065..9ad1bd7 100644 --- a/samples/15_DrawCube/15_DrawCube.cpp +++ b/samples/15_DrawCube/15_DrawCube.cpp @@ -26,7 +26,7 @@ static char const* AppName = "15_DrawCube"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/tests/DeviceFunctions/DeviceFunctions.cpp b/tests/DeviceFunctions/DeviceFunctions.cpp index df8f816..b0d3704 100644 --- a/tests/DeviceFunctions/DeviceFunctions.cpp +++ b/tests/DeviceFunctions/DeviceFunctions.cpp @@ -21,7 +21,7 @@ static char const* AppName = "DeviceFunctions"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/tests/DispatchLoaderDynamic/DispatchLoaderDynamic.cpp b/tests/DispatchLoaderDynamic/DispatchLoaderDynamic.cpp index 5abeb0e..06fbacd 100644 --- a/tests/DispatchLoaderDynamic/DispatchLoaderDynamic.cpp +++ b/tests/DispatchLoaderDynamic/DispatchLoaderDynamic.cpp @@ -22,7 +22,7 @@ static char const* AppName = "DispatchLoaderDynamic"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try { diff --git a/tests/NoExceptions/NoExceptions.cpp b/tests/NoExceptions/NoExceptions.cpp index 7bff3b3..8bae698 100644 --- a/tests/NoExceptions/NoExceptions.cpp +++ b/tests/NoExceptions/NoExceptions.cpp @@ -24,7 +24,7 @@ static char const* AppName = "DeviceFunctions"; static char const* EngineName = "Vulkan.hpp"; -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { vk::ApplicationInfo appInfo(AppName, 1, EngineName, 1, VK_API_VERSION_1_1); vk::UniqueInstance instance = vk::createInstanceUnique(vk::InstanceCreateInfo({}, &appInfo)).value; diff --git a/tests/StructureChain/StructureChain.cpp b/tests/StructureChain/StructureChain.cpp index 02c8782..495fdbf 100644 --- a/tests/StructureChain/StructureChain.cpp +++ b/tests/StructureChain/StructureChain.cpp @@ -29,7 +29,7 @@ static char const* EngineName = "Vulkan.hpp"; // unknow compiler... just ignore the warnings for yourselves ;) #endif -int main(int /*argc*/, char * /*argv[]*/) +int main(int /*argc*/, char ** /*argv*/) { try {