From b0d7501364794a881a34c1c612fdb0778bea5eb6 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 10 Oct 2015 18:32:53 +0200 Subject: [PATCH] Linux compile fixes --- renderdoc/driver/vulkan/vk_core.cpp | 10 +++++----- renderdoc/driver/vulkan/vk_replay_linux.cpp | 6 +++--- renderdoc/driver/vulkan/vk_resources.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 0c50d1b02..75c94c838 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -1065,7 +1065,7 @@ void WrappedVulkan::ProcessChunk(uint64_t offset, VulkanChunkType context) Serialise_vkCmdSetDepthBias(GetMainSerialiser(), VK_NULL_HANDLE, 0.0f, 0.0f, 0.0f); break; case SET_BLEND_CONST: - Serialise_vkCmdSetLineWidth(GetMainSerialiser(), VK_NULL_HANDLE, NULL); + Serialise_vkCmdSetBlendConstants(GetMainSerialiser(), VK_NULL_HANDLE, NULL); break; case SET_DEPTH_BOUNDS: Serialise_vkCmdSetDepthBounds(GetMainSerialiser(), VK_NULL_HANDLE, 0.0f, 0.0f); @@ -1116,10 +1116,10 @@ void WrappedVulkan::ProcessChunk(uint64_t offset, VulkanChunkType context) Serialise_vkCmdClearDepthStencilImage(GetMainSerialiser(), VK_NULL_HANDLE, VK_NULL_HANDLE, VK_IMAGE_LAYOUT_MAX_ENUM, NULL, 0, NULL); break; case CLEAR_COLOR_ATTACH: - Serialise_vkCmdClearColorAttachment(GetMainSerialiser(), VK_NULL_HANDLE, VK_NULL_HANDLE, VK_IMAGE_LAYOUT_MAX_ENUM, NULL, 0, NULL); + Serialise_vkCmdClearColorAttachment(GetMainSerialiser(), VK_NULL_HANDLE, 0, VK_IMAGE_LAYOUT_MAX_ENUM, NULL, 0, NULL); break; case CLEAR_DEPTHSTENCIL_ATTACH: - Serialise_vkCmdClearDepthStencilAttachment(GetMainSerialiser(), VK_NULL_HANDLE, VK_NULL_HANDLE, VK_IMAGE_LAYOUT_MAX_ENUM, NULL, 0, NULL); + Serialise_vkCmdClearDepthStencilAttachment(GetMainSerialiser(), VK_NULL_HANDLE, 0, VK_IMAGE_LAYOUT_MAX_ENUM, NULL, 0, NULL); break; case PIPELINE_BARRIER: Serialise_vkCmdPipelineBarrier(GetMainSerialiser(), VK_NULL_HANDLE, 0, 0, VK_FALSE, 0, NULL); @@ -1141,13 +1141,13 @@ void WrappedVulkan::ProcessChunk(uint64_t offset, VulkanChunkType context) Serialise_vkCmdDraw(GetMainSerialiser(), VK_NULL_HANDLE, 0, 0, 0, 0); break; case DRAW_INDIRECT: - Serialise_vkCmdDrawIndirect(GetMainSerialiser(), VK_NULL_HANDLE, VK_NULL_HANDLE, VK_NULL_HANDLE, 0, 0); + Serialise_vkCmdDrawIndirect(GetMainSerialiser(), VK_NULL_HANDLE, VK_NULL_HANDLE, 0, 0, 0); break; case DRAW_INDEXED: Serialise_vkCmdDrawIndexed(GetMainSerialiser(), VK_NULL_HANDLE, 0, 0, 0, 0, 0); break; case DRAW_INDEXED_INDIRECT: - Serialise_vkCmdDrawIndexedIndirect(GetMainSerialiser(), VK_NULL_HANDLE, VK_NULL_HANDLE, VK_NULL_HANDLE, 0, 0); + Serialise_vkCmdDrawIndexedIndirect(GetMainSerialiser(), VK_NULL_HANDLE, VK_NULL_HANDLE, 0, 0, 0); break; case DISPATCH: Serialise_vkCmdDispatch(GetMainSerialiser(), VK_NULL_HANDLE, 0, 0, 0); diff --git a/renderdoc/driver/vulkan/vk_replay_linux.cpp b/renderdoc/driver/vulkan/vk_replay_linux.cpp index 0651d8b78..3914c2c6b 100644 --- a/renderdoc/driver/vulkan/vk_replay_linux.cpp +++ b/renderdoc/driver/vulkan/vk_replay_linux.cpp @@ -39,15 +39,15 @@ void VulkanReplay::OutputWindow::SetWindowHandle(void *wn) screen = iter.data; } -void VulkanReplay::OutputWindow::InitSurfaceDescription(VkSurfaceDescriptionWindowWSI &surfDesc) +void VulkanReplay::OutputWindow::InitSurfaceDescription(VkSurfaceDescriptionWindowKHR &surfDesc) { - static VkPlatformHandleXcbWSI handle; + static VkPlatformHandleXcbKHR handle; handle.connection = connection; handle.root = screen->root; surfDesc.pPlatformHandle = &handle; surfDesc.pPlatformWindow = &wnd; - surfDesc.platform = VK_PLATFORM_X11_WSI; + surfDesc.platform = VK_PLATFORM_X11_KHR; } void VulkanReplay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h) diff --git a/renderdoc/driver/vulkan/vk_resources.h b/renderdoc/driver/vulkan/vk_resources.h index be5efebcc..7414d6d6c 100644 --- a/renderdoc/driver/vulkan/vk_resources.h +++ b/renderdoc/driver/vulkan/vk_resources.h @@ -77,7 +77,7 @@ enum VkResourceType // if we know what type it is struct RealVkRes { - RealVkRes() : handle(VK_NULL_HANDLE) {} + RealVkRes() : handle((uint64_t)VK_NULL_HANDLE) {} RealVkRes(void *disp) : handle((uint64_t)disp) {} RealVkRes(uint64_t nondisp) : handle(nondisp) {}