diff options
| author | 2021-04-05 22:25:22 -0400 | |
|---|---|---|
| committer | 2021-07-22 21:51:26 -0400 | |
| commit | 0bb85f6a753c769266c95c4ba146b25b9eaaaffd (patch) | |
| tree | e5d818ae7dc1d0025bb115c7a63235d866e53286 /src/video_core/renderer_vulkan | |
| parent | shader: Fix FCMP immediate variant (diff) | |
| download | yuzu-0bb85f6a753c769266c95c4ba146b25b9eaaaffd.tar.gz yuzu-0bb85f6a753c769266c95c4ba146b25b9eaaaffd.tar.xz yuzu-0bb85f6a753c769266c95c4ba146b25b9eaaaffd.zip | |
shader_recompiler,video_core: Cleanup some GCC and Clang errors
Mostly fixing unused *, implicit conversion, braced scalar init,
fpermissive, and some others.
Some Clang errors likely remain in video_core, and std::ranges is still
a pertinent issue in shader_recompiler
shader_recompiler: cmake: Force bracket depth to 1024 on Clang
Increases the maximum fold expression depth
thread_worker: Include condition_variable
Don't use list initializers in control flow
Co-authored-by: ReinUsesLisp <reinuseslisp@airmail.cc>
Diffstat (limited to 'src/video_core/renderer_vulkan')
4 files changed, 15 insertions, 15 deletions
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 893258b4a..57e2d569c 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |||
| @@ -447,7 +447,7 @@ void GraphicsPipeline::MakePipeline(const Device& device, VkRenderPass render_pa | |||
| 447 | .dynamicStateCount = static_cast<u32>(dynamic_states.size()), | 447 | .dynamicStateCount = static_cast<u32>(dynamic_states.size()), |
| 448 | .pDynamicStates = dynamic_states.data(), | 448 | .pDynamicStates = dynamic_states.data(), |
| 449 | }; | 449 | }; |
| 450 | const VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroup_size_ci{ | 450 | [[maybe_unused]] const VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroup_size_ci{ |
| 451 | .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT, | 451 | .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT, |
| 452 | .pNext = nullptr, | 452 | .pNext = nullptr, |
| 453 | .requiredSubgroupSize = GuestWarpSize, | 453 | .requiredSubgroupSize = GuestWarpSize, |
| @@ -457,15 +457,16 @@ void GraphicsPipeline::MakePipeline(const Device& device, VkRenderPass render_pa | |||
| 457 | if (!spv_modules[stage]) { | 457 | if (!spv_modules[stage]) { |
| 458 | continue; | 458 | continue; |
| 459 | } | 459 | } |
| 460 | [[maybe_unused]] auto& stage_ci = shader_stages.emplace_back(VkPipelineShaderStageCreateInfo{ | 460 | [[maybe_unused]] auto& stage_ci = |
| 461 | .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, | 461 | shader_stages.emplace_back(VkPipelineShaderStageCreateInfo{ |
| 462 | .pNext = nullptr, | 462 | .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, |
| 463 | .flags = 0, | 463 | .pNext = nullptr, |
| 464 | .stage = MaxwellToVK::ShaderStage(static_cast<Tegra::Engines::ShaderType>(stage)), | 464 | .flags = 0, |
| 465 | .module = *spv_modules[stage], | 465 | .stage = MaxwellToVK::ShaderStage(static_cast<Tegra::Engines::ShaderType>(stage)), |
| 466 | .pName = "main", | 466 | .module = *spv_modules[stage], |
| 467 | .pSpecializationInfo = nullptr, | 467 | .pName = "main", |
| 468 | }); | 468 | .pSpecializationInfo = nullptr, |
| 469 | }); | ||
| 469 | /* | 470 | /* |
| 470 | if (program[stage]->entries.uses_warps && device.IsGuestWarpSizeSupported(stage_ci.stage)) { | 471 | if (program[stage]->entries.uses_warps && device.IsGuestWarpSizeSupported(stage_ci.stage)) { |
| 471 | stage_ci.pNext = &subgroup_size_ci; | 472 | stage_ci.pNext = &subgroup_size_ci; |
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 23bf84a92..fcebb8f6e 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | |||
| @@ -47,7 +47,7 @@ auto MakeSpan(Container& container) { | |||
| 47 | return std::span(container.data(), container.size()); | 47 | return std::span(container.data(), container.size()); |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | u64 MakeCbufKey(u32 index, u32 offset) { | 50 | static u64 MakeCbufKey(u32 index, u32 offset) { |
| 51 | return (static_cast<u64>(index) << 32) | offset; | 51 | return (static_cast<u64>(index) << 32) | offset; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| @@ -638,6 +638,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, Tegra::GPU& gpu_, | |||
| 638 | .warp_size_potentially_larger_than_guest = device.IsWarpSizePotentiallyBiggerThanGuest(), | 638 | .warp_size_potentially_larger_than_guest = device.IsWarpSizePotentiallyBiggerThanGuest(), |
| 639 | .has_broken_spirv_clamp = driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS_KHR, | 639 | .has_broken_spirv_clamp = driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS_KHR, |
| 640 | .generic_input_types{}, | 640 | .generic_input_types{}, |
| 641 | .fixed_state_point_size{}, | ||
| 641 | }; | 642 | }; |
| 642 | } | 643 | } |
| 643 | 644 | ||
| @@ -748,7 +749,7 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline( | |||
| 748 | Shader::Environment& env{*envs[env_index]}; | 749 | Shader::Environment& env{*envs[env_index]}; |
| 749 | ++env_index; | 750 | ++env_index; |
| 750 | 751 | ||
| 751 | const u32 cfg_offset{env.StartAddress() + sizeof(Shader::ProgramHeader)}; | 752 | const u32 cfg_offset{static_cast<u32>(env.StartAddress() + sizeof(Shader::ProgramHeader))}; |
| 752 | Shader::Maxwell::Flow::CFG cfg(env, pools.flow_block, cfg_offset); | 753 | Shader::Maxwell::Flow::CFG cfg(env, pools.flow_block, cfg_offset); |
| 753 | programs[index] = TranslateProgram(pools.inst, pools.block, env, cfg); | 754 | programs[index] = TranslateProgram(pools.inst, pools.block, env, cfg); |
| 754 | } | 755 | } |
diff --git a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp b/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp index b2dcd74ab..991afe521 100644 --- a/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_render_pass_cache.cpp | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include <unordered_map> | 5 | #include <unordered_map> |
| 8 | 6 | ||
| 9 | #include <boost/container/static_vector.hpp> | 7 | #include <boost/container/static_vector.hpp> |
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index e42b091c5..70328680d 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp | |||
| @@ -279,7 +279,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) { | |||
| 279 | }; | 279 | }; |
| 280 | } | 280 | } |
| 281 | 281 | ||
| 282 | [[nodiscard]] std::vector<VkBufferCopy> TransformBufferCopies( | 282 | [[maybe_unused]] [[nodiscard]] std::vector<VkBufferCopy> TransformBufferCopies( |
| 283 | std::span<const VideoCommon::BufferCopy> copies, size_t buffer_offset) { | 283 | std::span<const VideoCommon::BufferCopy> copies, size_t buffer_offset) { |
| 284 | std::vector<VkBufferCopy> result(copies.size()); | 284 | std::vector<VkBufferCopy> result(copies.size()); |
| 285 | std::ranges::transform( | 285 | std::ranges::transform( |