From d4c644c4b8ed11aabb66e5ac4ed2d5dabf90cdc0 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 9 Apr 2015 11:52:55 -0600 Subject: rename vkPlatform.h -> vk_platform.h --- icd/common/icd.h | 2 +- include/vkIcd.h | 2 +- include/vkPlatform.h | 90 --------------------------------------------------- include/vk_platform.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/vulkan.h | 4 +-- 5 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 include/vkPlatform.h create mode 100644 include/vk_platform.h diff --git a/icd/common/icd.h b/icd/common/icd.h index a23b4d07..2f6bd77b 100644 --- a/icd/common/icd.h +++ b/icd/common/icd.h @@ -29,7 +29,7 @@ #define ICD_H #include -#include +#include #include #if defined(PLATFORM_LINUX) diff --git a/include/vkIcd.h b/include/vkIcd.h index b7916a86..3ecd988b 100644 --- a/include/vkIcd.h +++ b/include/vkIcd.h @@ -3,7 +3,7 @@ #include #include -#include "vkPlatform.h" +#include "vk_platform.h" /* * The ICD must reserve space for a pointer for the loader's dispatch diff --git a/include/vkPlatform.h b/include/vkPlatform.h deleted file mode 100644 index 526a1de8..00000000 --- a/include/vkPlatform.h +++ /dev/null @@ -1,90 +0,0 @@ -// -// File: vkPlatform.h -// -/* -** Copyright (c) 2014 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 __VKPLATFORM_H__ -#define __VKPLATFORM_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif // __cplusplus - -/* -*************************************************************************************************** -* Platform-specific directives and type declarations -*************************************************************************************************** -*/ - -#if defined(_WIN32) - // Ensure we don't pick up min/max macros from Winddef.h - #define NOMINMAX - - // On Windows, VKAPI should equate to the __stdcall convention - #define VKAPI __stdcall - - // C99: -#ifndef __cplusplus - #undef inline - #define inline __inline -#endif // __cplusplus -#elif defined(__GNUC__) - // On other platforms using GCC, VKAPI stays undefined - #define VKAPI -#else - // Unsupported Platform! - #error "Unsupported OS Platform detected!" -#endif - -#include - -#if !defined(VK_NO_STDINT_H) - #if defined(_MSC_VER) && (_MSC_VER < 1600) - typedef signed __int8 int8_t; - typedef unsigned __int8 uint8_t; - typedef signed __int16 int16_t; - typedef unsigned __int16 uint16_t; - typedef signed __int32 int32_t; - typedef unsigned __int32 uint32_t; - typedef signed __int64 int64_t; - typedef unsigned __int64 uint64_t; - #else - #include - #endif -#endif // !defined(VK_NO_STDINT_H) - -typedef uint64_t VK_GPU_SIZE; -typedef uint32_t bool32_t; - -typedef uint32_t VK_SAMPLE_MASK; -typedef uint32_t VK_FLAGS; -typedef int32_t VK_ENUM; - -#ifdef __cplusplus -} // extern "C" -#endif // __cplusplus - -#endif // __VKPLATFORM_H__ diff --git a/include/vk_platform.h b/include/vk_platform.h new file mode 100644 index 00000000..fc73dd16 --- /dev/null +++ b/include/vk_platform.h @@ -0,0 +1,90 @@ +// +// File: vk_platform.h +// +/* +** Copyright (c) 2014 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_PLATFORM_H__ +#define __VK_PLATFORM_H__ + +#ifdef __cplusplus +extern "C" +{ +#endif // __cplusplus + +/* +*************************************************************************************************** +* Platform-specific directives and type declarations +*************************************************************************************************** +*/ + +#if defined(_WIN32) + // Ensure we don't pick up min/max macros from Winddef.h + #define NOMINMAX + + // On Windows, VKAPI should equate to the __stdcall convention + #define VKAPI __stdcall + + // C99: +#ifndef __cplusplus + #undef inline + #define inline __inline +#endif // __cplusplus +#elif defined(__GNUC__) + // On other platforms using GCC, VKAPI stays undefined + #define VKAPI +#else + // Unsupported Platform! + #error "Unsupported OS Platform detected!" +#endif + +#include + +#if !defined(VK_NO_STDINT_H) + #if defined(_MSC_VER) && (_MSC_VER < 1600) + typedef signed __int8 int8_t; + typedef unsigned __int8 uint8_t; + typedef signed __int16 int16_t; + typedef unsigned __int16 uint16_t; + typedef signed __int32 int32_t; + typedef unsigned __int32 uint32_t; + typedef signed __int64 int64_t; + typedef unsigned __int64 uint64_t; + #else + #include + #endif +#endif // !defined(VK_NO_STDINT_H) + +typedef uint64_t VK_GPU_SIZE; +typedef uint32_t bool32_t; + +typedef uint32_t VK_SAMPLE_MASK; +typedef uint32_t VK_FLAGS; +typedef int32_t VK_ENUM; + +#ifdef __cplusplus +} // extern "C" +#endif // __cplusplus + +#endif // __VK_PLATFORM_H__ diff --git a/include/vulkan.h b/include/vulkan.h index b1bdac1d..b3527c0c 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -30,10 +30,10 @@ #define VK_MAKE_VERSION(major, minor, patch) \ ((major << 22) | (minor << 12) | patch) -#include "vkPlatform.h" +#include "vk_platform.h" // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 70, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 71, 0) #ifdef __cplusplus extern "C" -- cgit v1.2.3