From 81dd365ccc6601570e0b6633ac6cb93153660ff2 Mon Sep 17 00:00:00 2001 From: Markus Tavenrath Date: Tue, 22 Nov 2016 08:53:31 +0100 Subject: [PATCH] Fix naming conventions for functions in README.md and update to Vulkan 1.0.34 (#50) Fixes issue #49 --- README.md | 4 ++-- Vulkan-Docs | 2 +- vulkan/vulkan.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a94f095..03ebfed 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Vulkan-Hpp requires a C++11 capable compiler to compile. The following compilers # namespace vk To avoid name collisions with the Vulkan C API the C++ bindings reside in the vk namespace. The following rules apply to the new naming -* All functions, enums and structs have the Vk prefix removed. - * ```vkCreateImage``` can be accessed as ```vk::CreateImage``` +* All functions, enums, handles, and structs have the Vk prefix removed. In addition to this the first leter of functions is lower case. + * ```vkCreateImage``` can be accessed as ```vk::createImage``` * ```VkImageTiling``` can be accessed as ```vk::ImageTiling``` * ```VkImageCreateInfo``` can be accessed as ```vk::ImageCreateInfo``` * Enums are mapped to scoped enums to provide compile time type safety. The names have been changed to 'e' + CamelCase with the VK_ prefix and type infix removed. In case the enum type is an extension the extension suffix has been removed from the enum values. diff --git a/Vulkan-Docs b/Vulkan-Docs index 368b08a..08310a8 160000 --- a/Vulkan-Docs +++ b/Vulkan-Docs @@ -1 +1 @@ -Subproject commit 368b08a7b2add6db489d0af766bd74854e1c87d4 +Subproject commit 08310a88df8c803ac916102e7a364fff912e3281 diff --git a/vulkan/vulkan.hpp b/vulkan/vulkan.hpp index 159f36e..df00d28 100644 --- a/vulkan/vulkan.hpp +++ b/vulkan/vulkan.hpp @@ -41,7 +41,7 @@ # include #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ -static_assert( VK_HEADER_VERSION == 32 , "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 34 , "Wrong VK_HEADER_VERSION!" ); // 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default. // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION