Change include paths and argument type on main functions to ease linux adoption (#307)

This commit is contained in:
Andreas Süßenbach 2019-03-19 15:35:08 +01:00 committed by Markus Tavenrath
parent 3f20016ba9
commit 45590a9bd7
19 changed files with 30 additions and 30 deletions

View File

@ -21,7 +21,7 @@
static char const* AppName = "01_InitInstance"; static char const* AppName = "01_InitInstance";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
/* VULKAN_HPP_KEY_START */ /* VULKAN_HPP_KEY_START */

View File

@ -15,14 +15,14 @@
// VulkanHpp Samples : 02_EnumerateDevices // VulkanHpp Samples : 02_EnumerateDevices
// Enumerate physical devices // Enumerate physical devices
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
static char const* AppName = "02_EnumerateDevices"; static char const* AppName = "02_EnumerateDevices";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,14 +15,14 @@
// VulkanHpp Samples : 03_InitDevice // VulkanHpp Samples : 03_InitDevice
// Create and destroy a device // Create and destroy a device
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
static char const* AppName = "03_InitDevice"; static char const* AppName = "03_InitDevice";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,14 +15,14 @@
// VulkanHpp Samples : 04_InitCommandBuffer // VulkanHpp Samples : 04_InitCommandBuffer
// Create command buffer // Create command buffer
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
static char const* AppName = "04_InitCommandBuffer"; static char const* AppName = "04_InitCommandBuffer";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,14 +15,14 @@
// VulkanHpp Samples : 05_InitSwapchain // VulkanHpp Samples : 05_InitSwapchain
// Initialize a swapchain // Initialize a swapchain
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
static char const* AppName = "05_InitSwapchain"; static char const* AppName = "05_InitSwapchain";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,14 +15,14 @@
// VulkanHpp Samples : 06_InitDepthBuffer // VulkanHpp Samples : 06_InitDepthBuffer
// Initialize a depth buffer // Initialize a depth buffer
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
static char const* AppName = "06_InitDepthBuffer"; static char const* AppName = "06_InitDepthBuffer";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,7 +15,7 @@
// VulkanHpp Samples : 07_InitUniformBuffer // VulkanHpp Samples : 07_InitUniformBuffer
// Initialize a uniform buffer // Initialize a uniform buffer
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
@ -26,7 +26,7 @@
static char const* AppName = "07_InitUniformBuffer"; static char const* AppName = "07_InitUniformBuffer";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,14 +15,14 @@
// VulkanHpp Samples : 08_InitPipelineLayout // VulkanHpp Samples : 08_InitPipelineLayout
// Initialize a descriptor and pipeline layout // Initialize a descriptor and pipeline layout
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
static char const* AppName = "08_InitPipelineLayout"; static char const* AppName = "08_InitPipelineLayout";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,7 +15,7 @@
// VulkanHpp Samples : 09_InitDescriptorSet // VulkanHpp Samples : 09_InitDescriptorSet
// Initialize a descriptor set // Initialize a descriptor set
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
@ -26,7 +26,7 @@
static char const* AppName = "09_InitDescriptorSet"; static char const* AppName = "09_InitDescriptorSet";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,7 +15,7 @@
// VulkanHpp Samples : 10_InitRenderPass // VulkanHpp Samples : 10_InitRenderPass
// Initialize a render pass // Initialize a render pass
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include <iostream> #include <iostream>
@ -26,7 +26,7 @@
static char const* AppName = "10_InitRenderPass"; static char const* AppName = "10_InitRenderPass";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -15,8 +15,8 @@
// VulkanHpp Samples : 11_InitShaders // VulkanHpp Samples : 11_InitShaders
// Initialize vertex and fragment shaders // Initialize vertex and fragment shaders
#include "..\utils\shaders.hpp" #include "../utils/shaders.hpp"
#include "..\utils\utils.hpp" #include "../utils/utils.hpp"
#include "vulkan/vulkan.hpp" #include "vulkan/vulkan.hpp"
#include "SPIRV/GlslangToSpv.h" #include "SPIRV/GlslangToSpv.h"
#include <iostream> #include <iostream>
@ -24,7 +24,7 @@
static char const* AppName = "11_InitShaders"; static char const* AppName = "11_InitShaders";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -22,7 +22,7 @@
static char const* AppName = "12_InitFrameBuffers"; static char const* AppName = "12_InitFrameBuffers";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -23,7 +23,7 @@
static char const* AppName = "13_InitVertexBuffer"; static char const* AppName = "13_InitVertexBuffer";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -26,7 +26,7 @@
static char const* AppName = "14_InitPipeline"; static char const* AppName = "14_InitPipeline";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -26,7 +26,7 @@
static char const* AppName = "15_DrawCube"; static char const* AppName = "15_DrawCube";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -21,7 +21,7 @@
static char const* AppName = "DeviceFunctions"; static char const* AppName = "DeviceFunctions";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -22,7 +22,7 @@
static char const* AppName = "DispatchLoaderDynamic"; static char const* AppName = "DispatchLoaderDynamic";
static char const* EngineName = "Vulkan.hpp"; static char const* EngineName = "Vulkan.hpp";
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {

View File

@ -24,7 +24,7 @@
static char const* AppName = "DeviceFunctions"; static char const* AppName = "DeviceFunctions";
static char const* EngineName = "Vulkan.hpp"; 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::ApplicationInfo appInfo(AppName, 1, EngineName, 1, VK_API_VERSION_1_1);
vk::UniqueInstance instance = vk::createInstanceUnique(vk::InstanceCreateInfo({}, &appInfo)).value; vk::UniqueInstance instance = vk::createInstanceUnique(vk::InstanceCreateInfo({}, &appInfo)).value;

View File

@ -29,7 +29,7 @@ static char const* EngineName = "Vulkan.hpp";
// unknow compiler... just ignore the warnings for yourselves ;) // unknow compiler... just ignore the warnings for yourselves ;)
#endif #endif
int main(int /*argc*/, char * /*argv[]*/) int main(int /*argc*/, char ** /*argv*/)
{ {
try try
{ {