nintendo ultra 64 + formatting

This commit is contained in:
jnack 2024-08-30 10:46:09 -05:00
parent 72011e374b
commit e34eaee2e2
1 changed files with 6 additions and 7 deletions

View File

@ -63,11 +63,10 @@ const ComputePipeline* PipelineCache::GetComputePipeline() {
return pipeline; return pipeline;
} }
bool ShouldSkipShader(u32 shader_hash, const char* shader_type) { bool ShouldSkipShader(u64 shader_hash, const char* shader_type) {
static constexpr u32 skip_hashes[] = { static constexpr u64 skip_hashes[] = {0xdeadbeefULL};
0xdeadbeefULL if (std::ranges::find(std::begin(skip_hashes), std::end(skip_hashes), shader_hash) !=
}; std::end(skip_hashes)) {
if (std::ranges::find(std::begin(skip_hashes), std::end(skip_hashes), shader_hash) != std::end(skip_hashes)) {
LOG_WARNING(Render_Vulkan, "Skipped {} shader hash {:#x}.", shader_type, shader_hash); LOG_WARNING(Render_Vulkan, "Skipped {} shader hash {:#x}.", shader_type, shader_hash);
return true; return true;
} }
@ -176,7 +175,7 @@ bool PipelineCache::RefreshGraphicsKey() {
continue; continue;
} }
if (ShouldSkipShader(bininfo->shader_hash, "graphics")) { if (ShouldSkipShader(bininfo->shader_hash, "graphics")) {
return false; return false;
} }
const auto stage = Shader::Stage{i}; const auto stage = Shader::Stage{i};
const GuestProgram guest_pgm{pgm, stage}; const GuestProgram guest_pgm{pgm, stage};
@ -191,7 +190,7 @@ bool PipelineCache::RefreshComputeKey() {
const auto* cs_pgm = &liverpool->regs.cs_program; const auto* cs_pgm = &liverpool->regs.cs_program;
const GuestProgram guest_pgm{cs_pgm, Shader::Stage::Compute}; const GuestProgram guest_pgm{cs_pgm, Shader::Stage::Compute};
if (ShouldSkipShader(guest_pgm.hash, "compute")) { if (ShouldSkipShader(guest_pgm.hash, "compute")) {
return false; return false;
} }
std::tie(infos[0], modules[0], compute_key) = shader_cache->GetProgram(guest_pgm, binding); std::tie(infos[0], modules[0], compute_key) = shader_cache->GetProgram(guest_pgm, binding);
return true; return true;