From 582e799800576bf44f888a5e560b96834a815be6 Mon Sep 17 00:00:00 2001 From: Squareys Date: Thu, 28 Apr 2016 17:53:11 +0200 Subject: [PATCH] Vk: Add some Nvidia specific VkResults and required win32 surface ext Signed-off-by: Squareys --- src/Magnum/Vk/Context.cpp | 6 ++++-- src/Magnum/Vk/Context.h | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Magnum/Vk/Context.cpp b/src/Magnum/Vk/Context.cpp index 8704c00b4..564c64299 100644 --- a/src/Magnum/Vk/Context.cpp +++ b/src/Magnum/Vk/Context.cpp @@ -110,10 +110,10 @@ bool Context::tryCreate() { appInfo.pEngineName = "Magnum"; appInfo.apiVersion = UnsignedInt(_version); - std::vector enabledExtensions = { VK_KHR_SURFACE_EXTENSION_NAME }; + std::vector enabledExtensions = { VK_KHR_SURFACE_EXTENSION_NAME, "VK_KHR_win32_surface" }; // Enable surface extensions depending on os - //enabledExtensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); + // enabledExtensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME); VkInstanceCreateInfo instanceCreateInfo = {}; instanceCreateInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -190,6 +190,8 @@ Debug& operator<<(Debug& debug, Result value) { _c(ErrorIncompatibleDisplay) _c(ErrorValidationFailed) _c(ErrorInvalidShader) + _c(ErrorInvalidParameter) + _c(ErrorInvalidAlignment) #undef _c } diff --git a/src/Magnum/Vk/Context.h b/src/Magnum/Vk/Context.h index 0d63b1b6e..a905b456e 100644 --- a/src/Magnum/Vk/Context.h +++ b/src/Magnum/Vk/Context.h @@ -50,6 +50,9 @@ enum class Version: UnsignedInt { Vulkan_1_0 = VK_API_VERSION_1_0, /**< Vulkan 1.0 */ }; +#define VK_ERROR_INVALID_PARAMETER_NV -1000013000 +#define VK_ERROR_INVALID_ALIGNMENT_NV -1000013001 + enum class Result: Int { Success = VK_SUCCESS, /**< Success */ NotReady = VK_NOT_READY, /**< Not ready */ @@ -74,7 +77,9 @@ enum class Result: Int { ErrorOutOfDate = VK_ERROR_OUT_OF_DATE_KHR, /**< Out of date */ ErrorIncompatibleDisplay = VK_ERROR_INCOMPATIBLE_DISPLAY_KHR, /**< Incompatible display */ ErrorValidationFailed = VK_ERROR_VALIDATION_FAILED_EXT, /**< Validation failed */ - ErrorInvalidShader = VK_ERROR_INVALID_SHADER_NV /**< Invalid shader */ + ErrorInvalidShader = VK_ERROR_INVALID_SHADER_NV, /**< Invalid shader */ + ErrorInvalidParameter = VK_ERROR_INVALID_PARAMETER_NV, /**< Invalid Parameter, only on Nvidia */ + ErrorInvalidAlignment = VK_ERROR_INVALID_ALIGNMENT_NV, /**< Invalid Alignment, only on Nvidia */ }; /**