vulkan: Update to vulkan.h 1.0.3 am: e2948d83f3 (a745004a) · Commits · e / os / platform_frameworks_native

vulkan/api/templates/vulkan_h.tmpl

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@ extern "C" {
	#endif		#endif
	¶		¶
	/*		/*
	** Copyright (c) 2015 The Khronos Group Inc.		** Copyright (c) 2015-2016 The Khronos Group Inc.
	**		**
	** Permission is hereby granted, free of charge, to any person obtaining a		** Permission is hereby granted, free of charge, to any person obtaining a
	** copy of this software and/or associated documentation files (the		** copy of this software and/or associated documentation files (the
	@@ -47,12 +47,16 @@ extern "C" {
	#define VK_VERSION_1_0 1		#define VK_VERSION_1_0 1
	#include "vk_platform.h"		#include "vk_platform.h"
	¶		¶
	#define VK_MAKE_VERSION(major, minor, patch) ((major << 22) \| (minor << 12) \| patch)		#define VK_MAKE_VERSION(major, minor, patch) (((major) << 22) \| ((minor) << 12) \| (patch))
	¶		¶
	// Vulkan API version supported by this file		// Vulkan API version supported by this file
	#define VK_API_VERSION \		#define VK_API_VERSION \
	VK_MAKE_VERSION({{Global "VERSION_MAJOR"}}, {{Global "VERSION_MINOR"}}, {{Global "VERSION_PATCH"}})		VK_MAKE_VERSION({{Global "VERSION_MAJOR"}}, {{Global "VERSION_MINOR"}}, {{Global "VERSION_PATCH"}})
	¶		¶
			#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)
			¶
	#if defined(__cplusplus) && ((defined(_MSC_VER) && _MSC_VER >= 1800 \|\| __cplusplus >= 201103L)		#if defined(__cplusplus) && ((defined(_MSC_VER) && _MSC_VER >= 1800 \|\| __cplusplus >= 201103L)
	#define VK_NULL_HANDLE nullptr		#define VK_NULL_HANDLE nullptr
	#else		#else

vulkan/api/vulkan.api

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ import platform "platform.api"
	// API version (major.minor.patch)		// API version (major.minor.patch)
	define VERSION_MAJOR 1		define VERSION_MAJOR 1
	define VERSION_MINOR 0		define VERSION_MINOR 0
	define VERSION_PATCH 2		define VERSION_PATCH 3

	// API limits		// API limits
	define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256		define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
	@@ -75,7 +75,7 @@ define NULL_HANDLE 0
	@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_SPEC_VERSION 5		@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_SPEC_VERSION 5
	@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_NAME "VK_KHR_win32_surface"		@extension("VK_KHR_win32_surface") define VK_KHR_WIN32_SURFACE_NAME "VK_KHR_win32_surface"

	@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION 2		@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION 1
	@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_NAME "VK_EXT_debug_report"		@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_NAME "VK_EXT_debug_report"


	@@ -1299,9 +1299,9 @@ type VkFlags VkWin32SurfaceCreateFlagsKHR
	type VkFlags VkDebugReportFlagsEXT		type VkFlags VkDebugReportFlagsEXT
	@extension("VK_EXT_debug_report")		@extension("VK_EXT_debug_report")
	bitfield VkDebugReportFlagBitsEXT {		bitfield VkDebugReportFlagBitsEXT {
	VK_DEBUG_REPORT_INFO_BIT_EXT = 0x00000001,		VK_DEBUG_REPORT_INFORMATION_BIT_EXT = 0x00000001,
	VK_DEBUG_REPORT_WARN_BIT_EXT = 0x00000002,		VK_DEBUG_REPORT_WARNING_BIT_EXT = 0x00000002,
	VK_DEBUG_REPORT_PERF_WARN_BIT_EXT = 0x00000004,		VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT = 0x00000004,
	VK_DEBUG_REPORT_ERROR_BIT_EXT = 0x00000008,		VK_DEBUG_REPORT_ERROR_BIT_EXT = 0x00000008,
	VK_DEBUG_REPORT_DEBUG_BIT_EXT = 0x00000010,		VK_DEBUG_REPORT_DEBUG_BIT_EXT = 0x00000010,
	}		}

vulkan/include/vulkan/vk_ext_debug_report.h

deleted100644 → 0

+0 −149

Original line number	Original line	Diff line number	Diff line
	//
	// File: vk_ext_debug_report.h
	//
	/*
	*
	* Copyright (C) 2015 Valve Corporation
	* Copyright (C) 2015 Google Inc.
	*
	* Permission is hereby granted, free of charge, to any person obtaining a
	* copy of this software and associated documentation files (the "Software"),
	* to deal in the Software without restriction, including without limitation
	* the rights to use, copy, modify, merge, publish, distribute, sublicense,
	* and/or sell copies of the Software, and to permit persons to whom the
	* Software is 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 Software.
	*
	* THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER
	* DEALINGS IN THE SOFTWARE.
	*
	* Author: Cody Northrop <cody@lunarg.com>
	* Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
	* Author: Tony Barbour <tony@LunarG.com>
	*
	*/

	#pragma once

	#include "vulkan/vulkan.h"

	#ifdef __cplusplus
	extern "C"
	{
	#endif // __cplusplus

	/*
	***************************************************************************************************
	* DebugReport Vulkan Extension API
	***************************************************************************************************
	*/
	#define VK_EXT_debug_report 1
	VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)

	#define VK_EXT_DEBUG_REPORT_SPEC_VERSION 2
	#define VK_EXT_DEBUG_REPORT_EXTENSION_NAME "VK_EXT_debug_report"


	typedef enum VkDebugReportObjectTypeEXT {
	VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT = 0,
	VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT = 1,
	VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT = 2,
	VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT = 3,
	VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT = 4,
	VK_DEBUG_REPORT_OBJECT_TYPE_SEMAPHORE_EXT = 5,
	VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT = 6,
	VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT = 7,
	VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT = 8,
	VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT = 9,
	VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT = 10,
	VK_DEBUG_REPORT_OBJECT_TYPE_EVENT_EXT = 11,
	VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT = 12,
	VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT = 13,
	VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT = 14,
	VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT = 15,
	VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_CACHE_EXT = 16,
	VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT = 17,
	VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT = 18,
	VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT = 19,
	VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT = 20,
	VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT = 21,
	VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT = 22,
	VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT = 23,
	VK_DEBUG_REPORT_OBJECT_TYPE_FRAMEBUFFER_EXT = 24,
	VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT = 25,
	VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT = 26,
	VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT = 27,
	VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT = 28,
	} VkDebugReportObjectTypeEXT;

	typedef enum VkDebugReportErrorEXT {
	VK_DEBUG_REPORT_ERROR_NONE_EXT = 0,
	VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT = 1,
	} VkDebugReportErrorEXT;

	typedef enum VkDebugReportFlagBitsEXT {
	VK_DEBUG_REPORT_INFO_BIT_EXT = 0x00000001,
	VK_DEBUG_REPORT_WARN_BIT_EXT = 0x00000002,
	VK_DEBUG_REPORT_PERF_WARN_BIT_EXT = 0x00000004,
	VK_DEBUG_REPORT_ERROR_BIT_EXT = 0x00000008,
	VK_DEBUG_REPORT_DEBUG_BIT_EXT = 0x00000010,
	} VkDebugReportFlagBitsEXT;
	typedef VkFlags VkDebugReportFlagsEXT;

	typedef VkBool32 (VKAPI_PTR *PFN_vkDebugReportCallbackEXT)(
	VkDebugReportFlagsEXT flags,
	VkDebugReportObjectTypeEXT objectType,
	uint64_t object,
	size_t location,
	int32_t messageCode,
	const char* pLayerPrefix,
	const char* pMessage,
	void* pUserData);


	typedef struct VkDebugReportCallbackCreateInfoEXT {
	VkStructureType sType;
	const void* pNext;
	VkDebugReportFlagsEXT flags;
	PFN_vkDebugReportCallbackEXT pfnCallback;
	void* pUserData;
	} VkDebugReportCallbackCreateInfoEXT;

	typedef VkResult (VKAPI_PTR PFN_vkCreateDebugReportCallbackEXT)(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback);
	typedef void (VKAPI_PTR PFN_vkDestroyDebugReportCallbackEXT)(VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks pAllocator);
	typedef void (VKAPI_PTR PFN_vkDebugReportMessageEXT)(VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, size_t location, int32_t messageCode, const char pLayerPrefix, const char* pMessage);

	#ifndef VK_NO_PROTOTYPES
	VKAPI_ATTR VkResult VKAPI_CALL vkCreateDebugReportCallbackEXT(
	VkInstance instance,
	const VkDebugReportCallbackCreateInfoEXT* pCreateInfo,
	const VkAllocationCallbacks* pAllocator,
	VkDebugReportCallbackEXT* pCallback);

	VKAPI_ATTR void VKAPI_CALL vkDestroyDebugReportCallbackEXT(
	VkInstance instance,
	VkDebugReportCallbackEXT callback,
	const VkAllocationCallbacks* pAllocator);

	VKAPI_ATTR void VKAPI_CALL vkDebugReportMessageEXT(
	VkInstance instance,
	VkDebugReportFlagsEXT flags,
	VkDebugReportObjectTypeEXT objectType,
	uint64_t object,
	size_t location,
	int32_t messageCode,
	const char* pLayerPrefix,
	const char* pMessage);
	#endif

	#ifdef __cplusplus
	} // extern "C"
	#endif // __cplusplus

vulkan/include/vulkan/vk_layer_interface.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,6 @@
	#pragma once		#pragma once

	#include <vulkan/vulkan.h>		#include <vulkan/vulkan.h>
	#include <vulkan/vk_ext_debug_report.h>

	// ------------------------------------------------------------------------------------------------		// ------------------------------------------------------------------------------------------------
	// CreateInstance and CreateDevice support structures		// CreateInstance and CreateDevice support structures

vulkan/include/vulkan/vulkan.h

+107 −3

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ extern "C" {
	#endif		#endif

	/*		/*
	** Copyright (c) 2015 The Khronos Group Inc.		** Copyright (c) 2015-2016 The Khronos Group Inc.
	**		**
	** Permission is hereby granted, free of charge, to any person obtaining a		** Permission is hereby granted, free of charge, to any person obtaining a
	** copy of this software and/or associated documentation files (the		** copy of this software and/or associated documentation files (the
	@@ -38,11 +38,14 @@ extern "C" {
	#include "vk_platform.h"		#include "vk_platform.h"

	#define VK_MAKE_VERSION(major, minor, patch) \		#define VK_MAKE_VERSION(major, minor, patch) \
	((major << 22) \| (minor << 12) \| patch)		(((major) << 22) \| ((minor) << 12) \| (patch))

	// Vulkan API version supported by this file		// Vulkan API version supported by this file
	#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 2)		#define VK_API_VERSION VK_MAKE_VERSION(1, 0, 3)

			#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)

	#define VK_NULL_HANDLE 0		#define VK_NULL_HANDLE 0

	@@ -3664,6 +3667,107 @@ VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceWin32PresentationSupportKHR(
	#endif		#endif
	#endif /* VK_USE_PLATFORM_WIN32_KHR */		#endif /* VK_USE_PLATFORM_WIN32_KHR */

			#define VK_EXT_debug_report 1
			VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)

			#define VK_EXT_DEBUG_REPORT_SPEC_VERSION 1
			#define VK_EXT_DEBUG_REPORT_EXTENSION_NAME "VK_EXT_debug_report"


			typedef enum VkDebugReportObjectTypeEXT {
			VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT = 0,
			VK_DEBUG_REPORT_OBJECT_TYPE_INSTANCE_EXT = 1,
			VK_DEBUG_REPORT_OBJECT_TYPE_PHYSICAL_DEVICE_EXT = 2,
			VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_EXT = 3,
			VK_DEBUG_REPORT_OBJECT_TYPE_QUEUE_EXT = 4,
			VK_DEBUG_REPORT_OBJECT_TYPE_SEMAPHORE_EXT = 5,
			VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_BUFFER_EXT = 6,
			VK_DEBUG_REPORT_OBJECT_TYPE_FENCE_EXT = 7,
			VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT = 8,
			VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT = 9,
			VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT = 10,
			VK_DEBUG_REPORT_OBJECT_TYPE_EVENT_EXT = 11,
			VK_DEBUG_REPORT_OBJECT_TYPE_QUERY_POOL_EXT = 12,
			VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_VIEW_EXT = 13,
			VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT = 14,
			VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT = 15,
			VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_CACHE_EXT = 16,
			VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_LAYOUT_EXT = 17,
			VK_DEBUG_REPORT_OBJECT_TYPE_RENDER_PASS_EXT = 18,
			VK_DEBUG_REPORT_OBJECT_TYPE_PIPELINE_EXT = 19,
			VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT_EXT = 20,
			VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_EXT = 21,
			VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_POOL_EXT = 22,
			VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_SET_EXT = 23,
			VK_DEBUG_REPORT_OBJECT_TYPE_FRAMEBUFFER_EXT = 24,
			VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT = 25,
			VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT = 26,
			VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT = 27,
			VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT = 28,
			} VkDebugReportObjectTypeEXT;

			typedef enum VkDebugReportErrorEXT {
			VK_DEBUG_REPORT_ERROR_NONE_EXT = 0,
			VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT = 1,
			} VkDebugReportErrorEXT;


			typedef enum VkDebugReportFlagBitsEXT {
			VK_DEBUG_REPORT_INFORMATION_BIT_EXT = 0x00000001,
			VK_DEBUG_REPORT_WARNING_BIT_EXT = 0x00000002,
			VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT = 0x00000004,
			VK_DEBUG_REPORT_ERROR_BIT_EXT = 0x00000008,
			VK_DEBUG_REPORT_DEBUG_BIT_EXT = 0x00000010,
			} VkDebugReportFlagBitsEXT;
			typedef VkFlags VkDebugReportFlagsEXT;

			typedef VkBool32 (VKAPI_PTR *PFN_vkDebugReportCallbackEXT)(
			VkDebugReportFlagsEXT flags,
			VkDebugReportObjectTypeEXT objectType,
			uint64_t object,
			size_t location,
			int32_t messageCode,
			const char* pLayerPrefix,
			const char* pMessage,
			void* pUserData);


			typedef struct VkDebugReportCallbackCreateInfoEXT {
			VkStructureType sType;
			const void* pNext;
			VkDebugReportFlagsEXT flags;
			PFN_vkDebugReportCallbackEXT pfnCallback;
			void* pUserData;
			} VkDebugReportCallbackCreateInfoEXT;


			typedef VkResult (VKAPI_PTR PFN_vkCreateDebugReportCallbackEXT)(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback);
			typedef void (VKAPI_PTR PFN_vkDestroyDebugReportCallbackEXT)(VkInstance instance, VkDebugReportCallbackEXT callback, const VkAllocationCallbacks pAllocator);
			typedef void (VKAPI_PTR PFN_vkDebugReportMessageEXT)(VkInstance instance, VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, uint64_t object, size_t location, int32_t messageCode, const char pLayerPrefix, const char* pMessage);

			#ifndef VK_NO_PROTOTYPES
			VKAPI_ATTR VkResult VKAPI_CALL vkCreateDebugReportCallbackEXT(
			VkInstance instance,
			const VkDebugReportCallbackCreateInfoEXT* pCreateInfo,
			const VkAllocationCallbacks* pAllocator,
			VkDebugReportCallbackEXT* pCallback);

			VKAPI_ATTR void VKAPI_CALL vkDestroyDebugReportCallbackEXT(
			VkInstance instance,
			VkDebugReportCallbackEXT callback,
			const VkAllocationCallbacks* pAllocator);

			VKAPI_ATTR void VKAPI_CALL vkDebugReportMessageEXT(
			VkInstance instance,
			VkDebugReportFlagsEXT flags,
			VkDebugReportObjectTypeEXT objectType,
			uint64_t object,
			size_t location,
			int32_t messageCode,
			const char* pLayerPrefix,
			const char* pMessage);
			#endif

	#ifdef __cplusplus		#ifdef __cplusplus
	}		}
	#endif		#endif