From 5fca12af4914a855f53b408daec9d51cfbef3c2f Mon Sep 17 00:00:00 2001 From: flyinghead Date: Wed, 15 Dec 2021 17:58:58 +0100 Subject: [PATCH] msvc compilation warnings --- core/rend/vulkan/commandpool.h | 2 +- core/rend/vulkan/drawer.h | 6 +++--- core/rend/vulkan/oit/oit_drawer.h | 2 +- core/rend/vulkan/oit/oit_pipeline.h | 2 +- core/rend/vulkan/pipeline.h | 2 +- core/rend/vulkan/texture.h | 2 +- core/rend/vulkan/vk_context_lr.h | 2 +- core/rend/vulkan/vulkan_context.h | 2 +- core/rend/vulkan/vulkan_renderer.h | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/rend/vulkan/commandpool.h b/core/rend/vulkan/commandpool.h index 8a25638dd..f7296c501 100644 --- a/core/rend/vulkan/commandpool.h +++ b/core/rend/vulkan/commandpool.h @@ -57,7 +57,7 @@ public: void EndFrame() { std::vector commandBuffers = vk::uniqueToRaw(inFlightBuffers[index]); - VulkanContext::Instance()->SubmitCommandBuffers(commandBuffers.size(), commandBuffers.data(), *fences[index]); + VulkanContext::Instance()->SubmitCommandBuffers((u32)commandBuffers.size(), commandBuffers.data(), *fences[index]); } void BeginFrame() diff --git a/core/rend/vulkan/drawer.h b/core/rend/vulkan/drawer.h index b7e56ab0b..f7a5ea4ca 100644 --- a/core/rend/vulkan/drawer.h +++ b/core/rend/vulkan/drawer.h @@ -105,7 +105,7 @@ public: vk::CommandBuffer GetCurrentCommandBuffer() const { return currentCommandBuffer; } protected: - virtual size_t GetSwapChainSize() { return GetContext()->GetSwapChainSize(); } + virtual u32 GetSwapChainSize() { return GetContext()->GetSwapChainSize(); } virtual vk::CommandBuffer BeginRenderPass() = 0; void NewImage() { @@ -147,7 +147,7 @@ protected: } if (mainBuffers[bufferIndex]->bufferSize < size) { - u32 newSize = mainBuffers[bufferIndex]->bufferSize; + u32 newSize = (u32)mainBuffers[bufferIndex]->bufferSize; while (newSize < size) newSize *= 2; INFO_LOG(RENDERER, "Increasing main buffer size %d -> %d", (u32)mainBuffers[bufferIndex]->bufferSize, newSize); @@ -207,7 +207,7 @@ public: protected: vk::CommandBuffer BeginRenderPass() override; - size_t GetSwapChainSize() override { return 2; } + u32 GetSwapChainSize() override { return 2; } private: std::unique_ptr screenPipelineManager; diff --git a/core/rend/vulkan/oit/oit_drawer.h b/core/rend/vulkan/oit/oit_drawer.h index 14af4e8fc..94d4698b6 100644 --- a/core/rend/vulkan/oit/oit_drawer.h +++ b/core/rend/vulkan/oit/oit_drawer.h @@ -100,7 +100,7 @@ protected: } if (mainBuffers[bufferIndex]->bufferSize < size) { - u32 newSize = mainBuffers[bufferIndex]->bufferSize; + u32 newSize = (u32)mainBuffers[bufferIndex]->bufferSize; while (newSize < size) newSize *= 2; INFO_LOG(RENDERER, "Increasing main buffer size %d -> %d", (u32)mainBuffers[bufferIndex]->bufferSize, newSize); diff --git a/core/rend/vulkan/oit/oit_pipeline.h b/core/rend/vulkan/oit/oit_pipeline.h index 66a77ae16..995c549d4 100644 --- a/core/rend/vulkan/oit/oit_pipeline.h +++ b/core/rend/vulkan/oit/oit_pipeline.h @@ -168,7 +168,7 @@ public: { std::vector layouts(10, perPolyLayout); perPolyDescSets = GetContext()->GetDevice().allocateDescriptorSetsUnique( - vk::DescriptorSetAllocateInfo(GetContext()->GetDescriptorPool(), layouts.size(), &layouts[0])); + vk::DescriptorSetAllocateInfo(GetContext()->GetDescriptorPool(), (u32)layouts.size(), &layouts[0])); } vk::DescriptorImageInfo imageInfo0(samplerManager->GetSampler(tsp0), texture0->GetReadOnlyImageView(), vk::ImageLayout::eShaderReadOnlyOptimal); diff --git a/core/rend/vulkan/pipeline.h b/core/rend/vulkan/pipeline.h index 15ebd89b0..9cb6dabc5 100644 --- a/core/rend/vulkan/pipeline.h +++ b/core/rend/vulkan/pipeline.h @@ -97,7 +97,7 @@ public: { std::vector layouts(10, perPolyLayout); perPolyDescSets = GetContext()->GetDevice().allocateDescriptorSetsUnique( - vk::DescriptorSetAllocateInfo(GetContext()->GetDescriptorPool(), layouts.size(), &layouts[0])); + vk::DescriptorSetAllocateInfo(GetContext()->GetDescriptorPool(), (u32)layouts.size(), &layouts[0])); } vk::DescriptorImageInfo imageInfo(samplerManager->GetSampler(tsp), texture->GetReadOnlyImageView(), vk::ImageLayout::eShaderReadOnlyOptimal); diff --git a/core/rend/vulkan/texture.h b/core/rend/vulkan/texture.h index a44229e4c..5c7df75d7 100644 --- a/core/rend/vulkan/texture.h +++ b/core/rend/vulkan/texture.h @@ -102,7 +102,7 @@ public: std::make_pair(samplerHash, VulkanContext::Instance()->GetDevice().createSamplerUnique( vk::SamplerCreateInfo(vk::SamplerCreateFlags(), filter, filter, vk::SamplerMipmapMode::eNearest, uRepeat, vRepeat, vk::SamplerAddressMode::eClampToEdge, mipLodBias, - anisotropicFiltering, std::min(config::AnisotropicFiltering, VulkanContext::Instance()->GetMaxSamplerAnisotropy()), + anisotropicFiltering, std::min((float)config::AnisotropicFiltering, VulkanContext::Instance()->GetMaxSamplerAnisotropy()), false, vk::CompareOp::eNever, 0.0f, 256.0f, vk::BorderColor::eFloatOpaqueBlack)))).first->second.get(); } diff --git a/core/rend/vulkan/vk_context_lr.h b/core/rend/vulkan/vk_context_lr.h index 3d834543b..3bbe098e9 100644 --- a/core/rend/vulkan/vk_context_lr.h +++ b/core/rend/vulkan/vk_context_lr.h @@ -44,7 +44,7 @@ public: vk::Device GetDevice() const { return device; } vk::PipelineCache GetPipelineCache() const { return *pipelineCache; } vk::DescriptorPool GetDescriptorPool() const { return *descriptorPool; } - size_t GetSwapChainSize() const { u32 m = retro_render_if->get_sync_index_mask(retro_render_if->handle); u32 n = 1; while (m >>= 1) n++; return n; } + u32 GetSwapChainSize() const { u32 m = retro_render_if->get_sync_index_mask(retro_render_if->handle); u32 n = 1; while (m >>= 1) n++; return n; } int GetCurrentImageIndex() const { return retro_render_if->get_sync_index(retro_render_if->handle); } // FIXME that's not quite correct void WaitIdle() const { retro_render_if->wait_sync_index(retro_render_if->handle); } diff --git a/core/rend/vulkan/vulkan_context.h b/core/rend/vulkan/vulkan_context.h index a43aff991..f2fd17e56 100644 --- a/core/rend/vulkan/vulkan_context.h +++ b/core/rend/vulkan/vulkan_context.h @@ -70,7 +70,7 @@ public: vk::CommandBuffer GetCurrentCommandBuffer() const { return *commandBuffers[GetCurrentImageIndex()]; } vk::DescriptorPool GetDescriptorPool() const { return *descriptorPool; } vk::Extent2D GetViewPort() const { return { (u32)settings.display.width, (u32)settings.display.height }; } - size_t GetSwapChainSize() const { return imageViews.size(); } + u32 GetSwapChainSize() const { return (u32)imageViews.size(); } int GetCurrentImageIndex() const { return currentImage; } void WaitIdle() const; bool IsRendering() const { return rendering; } diff --git a/core/rend/vulkan/vulkan_renderer.h b/core/rend/vulkan/vulkan_renderer.h index b11c5c115..87ca570ab 100644 --- a/core/rend/vulkan/vulkan_renderer.h +++ b/core/rend/vulkan/vulkan_renderer.h @@ -213,10 +213,10 @@ public: cmdBuffer.setViewport(0, 1, &viewport); const vk::Rect2D scissor({ 0, 0 }, { (u32)settings.display.width, (u32)settings.display.height }); cmdBuffer.setScissor(0, 1, &scissor); - osdBuffer->upload(osdVertices.size() * sizeof(OSDVertex), osdVertices.data()); + osdBuffer->upload((u32)(osdVertices.size() * sizeof(OSDVertex)), osdVertices.data()); const vk::DeviceSize zero = 0; cmdBuffer.bindVertexBuffers(0, 1, &osdBuffer->buffer.get(), &zero); - for (size_t i = 0; i < osdVertices.size(); i += 4) + for (u32 i = 0; i < (u32)osdVertices.size(); i += 4) cmdBuffer.draw(4, 1, i, 0); if (clear_screen) GetContext()->EndFrame();