diff options
| author | 2021-01-24 17:36:43 -0500 | |
|---|---|---|
| committer | 2021-01-24 17:36:43 -0500 | |
| commit | df0d8c45d28832d08746e7c1a98782f05cdfcf7b (patch) | |
| tree | 0c0ce16e34704b6f3318c7f62c931a144dad83a5 /src/video_core/renderer_vulkan | |
| parent | Merge pull request #5363 from ReinUsesLisp/vk-image-usage (diff) | |
| parent | cmake: Enforce -Warray-bounds and -Wmissing-field-initializers globally (diff) | |
| download | yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.tar.gz yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.tar.xz yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.zip | |
Merge pull request #5807 from ReinUsesLisp/vc-warnings
video_core: Silence the remaining gcc warnings and enforce them
Diffstat (limited to 'src/video_core/renderer_vulkan')
4 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index b4473f194..85121d9fd 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp | |||
| @@ -676,7 +676,7 @@ VkFrontFace FrontFace(Maxwell::FrontFace front_face) { | |||
| 676 | return {}; | 676 | return {}; |
| 677 | } | 677 | } |
| 678 | 678 | ||
| 679 | VkCullModeFlags CullFace(Maxwell::CullFace cull_face) { | 679 | VkCullModeFlagBits CullFace(Maxwell::CullFace cull_face) { |
| 680 | switch (cull_face) { | 680 | switch (cull_face) { |
| 681 | case Maxwell::CullFace::Front: | 681 | case Maxwell::CullFace::Front: |
| 682 | return VK_CULL_MODE_FRONT_BIT; | 682 | return VK_CULL_MODE_FRONT_BIT; |
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.h b/src/video_core/renderer_vulkan/maxwell_to_vk.h index e59e6b6e2..7c34b47dc 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.h +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.h | |||
| @@ -63,7 +63,7 @@ VkBlendFactor BlendFactor(Maxwell::Blend::Factor factor); | |||
| 63 | 63 | ||
| 64 | VkFrontFace FrontFace(Maxwell::FrontFace front_face); | 64 | VkFrontFace FrontFace(Maxwell::FrontFace front_face); |
| 65 | 65 | ||
| 66 | VkCullModeFlags CullFace(Maxwell::CullFace cull_face); | 66 | VkCullModeFlagBits CullFace(Maxwell::CullFace cull_face); |
| 67 | 67 | ||
| 68 | VkComponentSwizzle SwizzleSource(Tegra::Texture::SwizzleSource swizzle); | 68 | VkComponentSwizzle SwizzleSource(Tegra::Texture::SwizzleSource swizzle); |
| 69 | 69 | ||
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index a5214d0bc..485cb43f2 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | |||
| @@ -181,6 +181,7 @@ std::vector<vk::ShaderModule> VKGraphicsPipeline::CreateShaderModules( | |||
| 181 | .pNext = nullptr, | 181 | .pNext = nullptr, |
| 182 | .flags = 0, | 182 | .flags = 0, |
| 183 | .codeSize = 0, | 183 | .codeSize = 0, |
| 184 | .pCode = nullptr, | ||
| 184 | }; | 185 | }; |
| 185 | 186 | ||
| 186 | std::vector<vk::ShaderModule> shader_modules; | 187 | std::vector<vk::ShaderModule> shader_modules; |
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.h b/src/video_core/renderer_vulkan/vk_texture_cache.h index a55d405d1..8d29361a1 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.h +++ b/src/video_core/renderer_vulkan/vk_texture_cache.h | |||
| @@ -72,7 +72,7 @@ struct TextureCacheRuntime { | |||
| 72 | MemoryAllocator& memory_allocator; | 72 | MemoryAllocator& memory_allocator; |
| 73 | StagingBufferPool& staging_buffer_pool; | 73 | StagingBufferPool& staging_buffer_pool; |
| 74 | BlitImageHelper& blit_image_helper; | 74 | BlitImageHelper& blit_image_helper; |
| 75 | std::unordered_map<RenderPassKey, vk::RenderPass> renderpass_cache; | 75 | std::unordered_map<RenderPassKey, vk::RenderPass> renderpass_cache{}; |
| 76 | 76 | ||
| 77 | void Finish(); | 77 | void Finish(); |
| 78 | 78 | ||