diff options
author | LC <mathew1800@gmail.com> | 2021-01-24 23:36:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-24 23:36:43 +0100 |
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 yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.tar.gz yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.tar.bz2 yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.tar.lz yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.tar.xz yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.tar.zst yuzu-df0d8c45d28832d08746e7c1a98782f05cdfcf7b.zip |
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) { return {}; } -VkCullModeFlags CullFace(Maxwell::CullFace cull_face) { +VkCullModeFlagBits CullFace(Maxwell::CullFace cull_face) { switch (cull_face) { case Maxwell::CullFace::Front: 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); VkFrontFace FrontFace(Maxwell::FrontFace front_face); -VkCullModeFlags CullFace(Maxwell::CullFace cull_face); +VkCullModeFlagBits CullFace(Maxwell::CullFace cull_face); VkComponentSwizzle SwizzleSource(Tegra::Texture::SwizzleSource swizzle); 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( .pNext = nullptr, .flags = 0, .codeSize = 0, + .pCode = nullptr, }; 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 { MemoryAllocator& memory_allocator; StagingBufferPool& staging_buffer_pool; BlitImageHelper& blit_image_helper; - std::unordered_map<RenderPassKey, vk::RenderPass> renderpass_cache; + std::unordered_map<RenderPassKey, vk::RenderPass> renderpass_cache{}; void Finish(); |