summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-03-29 02:55:47 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:25 +0200
commit3c758d9b538e957a20ea6db136741ad2bd16406d (patch)
treea1ef655bba3fd5aca5ab18ddaef3f312d1850b26 /src/video_core
parentshader: Fix ISCADD logic for PO/CC (diff)
downloadyuzu-3c758d9b538e957a20ea6db136741ad2bd16406d.tar
yuzu-3c758d9b538e957a20ea6db136741ad2bd16406d.tar.gz
yuzu-3c758d9b538e957a20ea6db136741ad2bd16406d.tar.bz2
yuzu-3c758d9b538e957a20ea6db136741ad2bd16406d.tar.lz
yuzu-3c758d9b538e957a20ea6db136741ad2bd16406d.tar.xz
yuzu-3c758d9b538e957a20ea6db136741ad2bd16406d.tar.zst
yuzu-3c758d9b538e957a20ea6db136741ad2bd16406d.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_vulkan/vk_pipeline_cache.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 0d6a32bfd..8b2816c13 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -68,7 +68,7 @@ public:
}
cached_lowest = start_address;
cached_highest = start_address + static_cast<u32>(*size);
- return Common::CityHash128(reinterpret_cast<const char*>(code.data()), code.size());
+ return Common::CityHash128(reinterpret_cast<const char*>(code.data()), *size);
}
void SetCachedSize(size_t size_bytes) {
@@ -126,12 +126,10 @@ public:
.write(reinterpret_cast<const char*>(&read_highest), sizeof(read_highest))
.write(reinterpret_cast<const char*>(&stage), sizeof(stage))
.write(data.get(), code_size);
- file.flush();
for (const auto [key, type] : texture_types) {
file.write(reinterpret_cast<const char*>(&key), sizeof(key))
.write(reinterpret_cast<const char*>(&type), sizeof(type));
}
- file.flush();
if (stage == Shader::Stage::Compute) {
const std::array<u32, 3> workgroup_size{WorkgroupSize()};
const u32 shared_memory_size{SharedMemorySize()};
@@ -141,7 +139,6 @@ public:
} else {
file.write(reinterpret_cast<const char*>(&sph), sizeof(sph));
}
- file.flush();
}
protected:
@@ -161,10 +158,10 @@ protected:
code.resize(size / INST_SIZE);
u64* const data = code.data() + offset / INST_SIZE;
gpu_memory->ReadBlock(guest_addr, data, BLOCK_SIZE);
- for (size_t i = 0; i < BLOCK_SIZE; i += INST_SIZE) {
- const u64 inst = data[i / INST_SIZE];
+ for (size_t index = 0; index < BLOCK_SIZE; index += INST_SIZE) {
+ const u64 inst = data[index / INST_SIZE];
if (inst == SELF_BRANCH_A || inst == SELF_BRANCH_B) {
- return offset + i;
+ return offset + index;
}
}
guest_addr += BLOCK_SIZE;
@@ -751,7 +748,7 @@ GraphicsPipeline PipelineCache::CreateGraphicsPipeline() {
continue;
}
const auto program{static_cast<Maxwell::ShaderProgram>(index)};
- GraphicsEnvironment& env{graphics_envs[index]};
+ auto& env{graphics_envs[index]};
const u32 start_address{maxwell3d.regs.shader_config[index].offset};
env = GraphicsEnvironment{maxwell3d, gpu_memory, program, base_addr, start_address};
env.SetCachedSize(shader_infos[index]->size_bytes);
@@ -771,6 +768,8 @@ ComputePipeline PipelineCache::CreateComputePipeline(const ComputePipelineCacheK
const GPUVAddr program_base{kepler_compute.regs.code_loc.Address()};
const auto& qmd{kepler_compute.launch_description};
ComputeEnvironment env{kepler_compute, gpu_memory, program_base, qmd.program_start};
+ env.SetCachedSize(shader->size_bytes);
+
main_pools.ReleaseContents();
ComputePipeline pipeline{CreateComputePipeline(main_pools, key, env)};
if (!pipeline_cache_filename.empty()) {