From f165eb261606f24f52602744470be7ec993966ae Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 25 Mar 2019 14:40:38 +0000 Subject: [PATCH] Fix clang-format issues on GGP branch merge --- renderdoc/driver/vulkan/vk_core.cpp | 4 ++-- renderdoc/driver/vulkan/vk_ggp.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 35e942688..2513b526d 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -741,12 +741,12 @@ static const VkExtensionProperties supportedExtensions[] = { }, #ifdef VK_GGP_frame_token { - VK_GGP_FRAME_TOKEN_EXTENSION_NAME, VK_GGP_FRAME_TOKEN_SPEC_VERSION, + VK_GGP_FRAME_TOKEN_EXTENSION_NAME, VK_GGP_FRAME_TOKEN_SPEC_VERSION, }, #endif #ifdef VK_GGP_stream_descriptor_surface { - VK_GGP_STREAM_DESCRIPTOR_SURFACE_EXTENSION_NAME, VK_GGP_STREAM_DESCRIPTOR_SURFACE_SPEC_VERSION, + VK_GGP_STREAM_DESCRIPTOR_SURFACE_EXTENSION_NAME, VK_GGP_STREAM_DESCRIPTOR_SURFACE_SPEC_VERSION, }, #endif { diff --git a/renderdoc/driver/vulkan/vk_ggp.cpp b/renderdoc/driver/vulkan/vk_ggp.cpp index 9c3186a61..0ae508c13 100644 --- a/renderdoc/driver/vulkan/vk_ggp.cpp +++ b/renderdoc/driver/vulkan/vk_ggp.cpp @@ -76,8 +76,7 @@ void VulkanReplay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h OutputWindow &outw = m_OutputWindows[id]; - RDCLOG("Window system is GGP (%d), size is %d, %d", outw.m_WindowSystem, outw.width, - outw.height); + RDCLOG("Window system is GGP (%d), size is %d, %d", outw.m_WindowSystem, outw.width, outw.height); // No window, specify default resolution. w = outw.width != 0 ? outw.width : 1920; h = outw.height != 0 ? outw.height : 1080;