diff options
| author | Jon Ashburn <jon@lunarg.com> | 2016-03-22 12:57:13 -0600 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-03-22 14:18:54 -0600 |
| commit | 6b501fb701599a9748ab3b87b1e64d842e9ac623 (patch) | |
| tree | 8724977b524b4dc6825b54bf52e490237f4a4d43 /include | |
| parent | cd4bfc0060c4f2126f4b57e7f0180ed30fa024d8 (diff) | |
| download | usermoji-6b501fb701599a9748ab3b87b1e64d842e9ac623.tar.xz | |
misc: Update to header version 1.0.6
Change-Id: Idf7a9d40278b796e16effa54e9b60668d275b8ec
Diffstat (limited to 'include')
| -rw-r--r-- | include/vulkan/vk_platform.h | 8 | ||||
| -rw-r--r-- | include/vulkan/vulkan.h | 17 |
2 files changed, 19 insertions, 6 deletions
diff --git a/include/vulkan/vk_platform.h b/include/vulkan/vk_platform.h index 075a18ca..f5a5243b 100644 --- a/include/vulkan/vk_platform.h +++ b/include/vulkan/vk_platform.h @@ -2,7 +2,7 @@ // File: vk_platform.h // /* -** Copyright (c) 2014-2016 The Khronos Group Inc. +** Copyright (c) 2014-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 @@ -25,8 +25,8 @@ */ -#ifndef __VK_PLATFORM_H__ -#define __VK_PLATFORM_H__ +#ifndef VK_PLATFORM_H_ +#define VK_PLATFORM_H_ #ifdef __cplusplus extern "C" @@ -124,4 +124,4 @@ extern "C" #include <xcb/xcb.h> #endif -#endif // __VK_PLATFORM_H__ +#endif diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index f57c4d93..567671a9 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -40,12 +40,18 @@ extern "C" { #define VK_MAKE_VERSION(major, minor, patch) \ (((major) << 22) | ((minor) << 12) | (patch)) -// Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 5) +// DEPRECATED: This define has been removed. Specific version defines (e.g. VK_API_VERSION_1_0), or the VK_MAKE_VERSION macro, should be used instead. +//#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 0) + +// Vulkan 1.0 version number +#define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_VERSION_MAJOR(version) ((uint32_t)(version) >> 22) #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) +// Version of this file +#define VK_HEADER_VERSION 6 + #define VK_NULL_HANDLE 0 @@ -680,6 +686,7 @@ typedef enum VkDynamicState { typedef enum VkFilter { VK_FILTER_NEAREST = 0, VK_FILTER_LINEAR = 1, + VK_FILTER_CUBIC_IMG = 1000015000, VK_FILTER_BEGIN_RANGE = VK_FILTER_NEAREST, VK_FILTER_END_RANGE = VK_FILTER_LINEAR, VK_FILTER_RANGE_SIZE = (VK_FILTER_LINEAR - VK_FILTER_NEAREST + 1), @@ -809,6 +816,7 @@ typedef enum VkFormatFeatureFlagBits { VK_FORMAT_FEATURE_BLIT_SRC_BIT = 0x00000400, VK_FORMAT_FEATURE_BLIT_DST_BIT = 0x00000800, VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT = 0x00001000, + VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG = 0x00002000, } VkFormatFeatureFlagBits; typedef VkFlags VkFormatFeatureFlags; @@ -3780,6 +3788,11 @@ VKAPI_ATTR void VKAPI_CALL vkDebugReportMessageEXT( #define VK_NV_GLSL_SHADER_EXTENSION_NAME "VK_NV_glsl_shader" +#define VK_IMG_filter_cubic 1 +#define VK_IMG_FILTER_CUBIC_SPEC_VERSION 1 +#define VK_IMG_FILTER_CUBIC_EXTENSION_NAME "VK_IMG_filter_cubic" + + #ifdef __cplusplus } #endif |