diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-05-23 02:03:57 +0200 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-06-07 09:32:57 +0200 |
| commit | abcea1bb188cb4db0ee7e27bea26d6458c881c2d (patch) | |
| tree | 80d0ac5c2bb51d321c36c0d46c0f5284f18a3a3a /src/video_core/renderer_vulkan | |
| parent | vk_pipeline_cache: Use generic shader cache (diff) | |
| download | yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.tar yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.tar.gz yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.tar.bz2 yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.tar.lz yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.tar.xz yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.tar.zst yuzu-abcea1bb188cb4db0ee7e27bea26d6458c881c2d.zip | |
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_buffer_cache.h | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index a54583e7d..65cb3c8ad 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h @@ -8,7 +8,6 @@ #include "common/common_types.h" #include "video_core/buffer_cache/buffer_cache.h" -#include "video_core/rasterizer_cache.h" #include "video_core/renderer_vulkan/vk_memory_manager.h" #include "video_core/renderer_vulkan/vk_staging_buffer_pool.h" #include "video_core/renderer_vulkan/vk_stream_buffer.h" diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 20cbeb671..150d86b62 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -335,12 +335,11 @@ VKPipelineCache::DecompileShaders(const GraphicsPipelineCacheKey& key) { } const GPUVAddr gpu_addr = GetShaderAddress(system, program_enum); - const auto cpu_addr = memory_manager.GpuToCpuAddress(gpu_addr); - const auto shader = cpu_addr ? TryGet(*cpu_addr) : null_shader; - ASSERT(shader); + const std::optional<VAddr> cpu_addr = memory_manager.GpuToCpuAddress(gpu_addr); + Shader* const shader = cpu_addr ? TryGet(*cpu_addr) : null_shader.get(); const std::size_t stage = index == 0 ? 0 : index - 1; // Stage indices are 0 - 5 - const auto program_type = GetShaderType(program_enum); + const ShaderType program_type = GetShaderType(program_enum); const auto& entries = shader->GetEntries(); program[stage] = { Decompile(device, shader->GetIR(), program_type, shader->GetRegistry(), specialization), |