From 048a12f589cd87e06216a45e16bd4ee8e63f1aa2 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 27 Mar 2016 09:25:25 -0700 Subject: [PATCH] Buildfix. Some compilers didn't like that, oops. --- Common/Vulkan/VulkanContext.cpp | 4 ++-- GPU/Vulkan/GPU_Vulkan.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp index 65bd6252ea..fb644b5246 100644 --- a/Common/Vulkan/VulkanContext.cpp +++ b/Common/Vulkan/VulkanContext.cpp @@ -639,7 +639,7 @@ VkResult VulkanContext::CreateDevice(int physical_device) { VK_FORMAT_D16_UNORM_S8_UINT, }; deviceInfo_.preferredDepthStencilFormat = VK_FORMAT_UNDEFINED; - for (int i = 0; i < ARRAY_SIZE(depthStencilFormats); i++) { + for (size_t i = 0; i < ARRAY_SIZE(depthStencilFormats); i++) { VkFormatProperties props; vkGetPhysicalDeviceFormatProperties(physical_devices_[0], depthStencilFormats[i], &props); if (props.optimalTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT) { @@ -1255,7 +1255,7 @@ void VulkanContext::DestroyFramebuffers() { void VulkanContext::DestroySurfaceRenderPass() { vkDestroyRenderPass(device_, surface_render_pass_, NULL); - surface_render_pass_ = NULL; + surface_render_pass_ = VK_NULL_HANDLE; } void VulkanContext::DestroyDevice() { diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index 7f5e8f4841..5b1d4723a9 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -529,7 +529,7 @@ void GPU_Vulkan::BuildReportingInfo() { const auto &props = vulkan_->GetPhysicalDeviceProperties(); const auto &features = vulkan_->GetFeaturesAvailable(); -#define CHECK_BOOL_FEATURE(n) do { if (features.##n) { featureNames += ", " #n; } } while (false) +#define CHECK_BOOL_FEATURE(n) do { if (features.n) { featureNames += ", " #n; } } while (false) std::string featureNames = ""; CHECK_BOOL_FEATURE(robustBufferAccess);