From 93f8a59a8fd353bb7fb7cdef7d8fe48e9ff7f959 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 2 Aug 2021 16:27:48 +0100 Subject: [PATCH] Linux compile fixes --- qrenderdoc/Widgets/MarkerBreadcrumbs.h | 1 + renderdoc/driver/vulkan/vk_resources.cpp | 2 +- renderdoc/driver/vulkan/vk_resources.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qrenderdoc/Widgets/MarkerBreadcrumbs.h b/qrenderdoc/Widgets/MarkerBreadcrumbs.h index fcaf0ac63..efb9ab41a 100644 --- a/qrenderdoc/Widgets/MarkerBreadcrumbs.h +++ b/qrenderdoc/Widgets/MarkerBreadcrumbs.h @@ -28,6 +28,7 @@ #include struct ICaptureContext; +struct IEventBrowser; class RDToolButton; class RDLabel; diff --git a/renderdoc/driver/vulkan/vk_resources.cpp b/renderdoc/driver/vulkan/vk_resources.cpp index 30f8ab3b2..c016ec52b 100644 --- a/renderdoc/driver/vulkan/vk_resources.cpp +++ b/renderdoc/driver/vulkan/vk_resources.cpp @@ -3589,7 +3589,7 @@ bool FramebufferInfo::AttachmentFullyReferenced(size_t attachmentIndex, VkResour { // check and make sure all views are referenced by the renderpass uint32_t renderpass_viewmask = rpi->multiviewViewMaskTable[attachmentIndex]; - return (int)Bits::CountOnes(renderpass_viewmask) == att->resInfo->imageInfo.layerCount; + return Bits::CountOnes(renderpass_viewmask) == att->resInfo->imageInfo.layerCount; } return viewRange.layerCount == layers; } diff --git a/renderdoc/driver/vulkan/vk_resources.h b/renderdoc/driver/vulkan/vk_resources.h index 906835b0b..6c10cc7e8 100644 --- a/renderdoc/driver/vulkan/vk_resources.h +++ b/renderdoc/driver/vulkan/vk_resources.h @@ -1983,8 +1983,8 @@ FrameRefType ImgRefs::Update(ImageRange range, FrameRefType refType, Compose com } Split(range.aspectMask != aspectMask, - range.baseMipLevel != 0 || (int)range.levelCount != imageInfo.levelCount, - range.baseArrayLayer != 0 || (int)range.layerCount != imageInfo.layerCount); + range.baseMipLevel != 0 || range.levelCount != imageInfo.levelCount, + range.baseArrayLayer != 0 || range.layerCount != imageInfo.layerCount); rdcarray splitAspects; if(areAspectsSplit)