From f871f7748cc3ac0a943b7430df0beea26bcac148 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 1 Sep 2015 09:00:16 -0600 Subject: headers: Add vk_sdk_platform.h for Win/Linux differences --- demos/cube.c | 1 + icd/common/icd.h | 1 + include/vk_icd.h | 1 + include/vk_sdk_platform.h | 39 +++++++++++++++++++++++++++++++++++++++ loader/vk_loader_platform.h | 1 + 5 files changed, 43 insertions(+) create mode 100644 include/vk_sdk_platform.h diff --git a/demos/cube.c b/demos/cube.c index 183d35dc..f388b4e3 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -43,6 +43,7 @@ #include "icd-spv.h" +#include "vk_sdk_platform.h" #include "linmath.h" #include diff --git a/icd/common/icd.h b/icd/common/icd.h index d5ea8074..bb598ecd 100644 --- a/icd/common/icd.h +++ b/icd/common/icd.h @@ -33,6 +33,7 @@ #include #include "vk_wsi_swapchain.h" #include "vk_wsi_device_swapchain.h" +#include "vk_sdk_platform.h" #if defined(__GNUC__) && __GNUC__ >= 4 # define ICD_EXPORT __attribute__((visibility("default"))) diff --git a/include/vk_icd.h b/include/vk_icd.h index cea46be7..634d653f 100644 --- a/include/vk_icd.h +++ b/include/vk_icd.h @@ -4,6 +4,7 @@ #include #include #include "vk_platform.h" +#include "vk_sdk_platform.h" /* * The ICD must reserve space for a pointer for the loader's dispatch diff --git a/include/vk_sdk_platform.h b/include/vk_sdk_platform.h new file mode 100644 index 00000000..0f9b4cad --- /dev/null +++ b/include/vk_sdk_platform.h @@ -0,0 +1,39 @@ +// +// File: vk_sdk_platform.h +// + +/* +** Copyright (c) 2015 The Khronos Group Inc. +** +** Permission is hereby granted, free of charge, to any person obtaining a +** copy of this software and/or associated documentation files (the +** "Materials"), to deal in the Materials without restriction, including +** without limitation the rights to use, copy, modify, merge, publish, +** distribute, sublicense, and/or sell copies of the Materials, and to +** permit persons to whom the Materials are 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 Materials. +** +** THE MATERIALS ARE 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 +** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +*/ + +#ifndef VK_SDK_PLATFORM_H +#define VK_SDK_PLATFORM_H + +#if defined(_WIN32) +# define NOMINMAX +# ifndef __cplusplus +# undef inline +# define inline __inline +# endif // __cplusplus +#endif // _WIN32 + +#endif // VK_SDK_PLATFORM_H diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h index 41d6d472..92071549 100644 --- a/loader/vk_loader_platform.h +++ b/loader/vk_loader_platform.h @@ -32,6 +32,7 @@ #define LOADER_PLATFORM_H #include "vk_platform.h" +#include "vk_sdk_platform.h" #if defined(__linux__) /* Linux-specific common code: */ -- cgit v1.2.3