From 754a9dfd778972c801469d69fb83522a803e7457 Mon Sep 17 00:00:00 2001 From: Billy Laws Date: Tue, 7 Feb 2023 16:33:58 +0000 Subject: [PATCH] Avoid storing guest shader hash in generated spirv This accidentally broke VK spec and could harm driver caching. --- app/libraries/shader-compiler | 2 +- app/src/main/cpp/skyline/gpu/shader_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/libraries/shader-compiler b/app/libraries/shader-compiler index 46f872d0..8cf4dd99 160000 --- a/app/libraries/shader-compiler +++ b/app/libraries/shader-compiler @@ -1 +1 @@ -Subproject commit 46f872d01fff2eb5bac921fc4fccb2305af9bb8e +Subproject commit 8cf4dd997193192c6fc8200095fb251759467b9b diff --git a/app/src/main/cpp/skyline/gpu/shader_manager.cpp b/app/src/main/cpp/skyline/gpu/shader_manager.cpp index 554478b7..6acb6117 100644 --- a/app/src/main/cpp/skyline/gpu/shader_manager.cpp +++ b/app/src/main/cpp/skyline/gpu/shader_manager.cpp @@ -410,7 +410,7 @@ namespace skyline::gpu { if (program.info.loads.Legacy() || program.info.stores.Legacy()) Shader::Maxwell::ConvertLegacyToGeneric(program, runtimeInfo); - auto spirv{Shader::Backend::SPIRV::EmitSPIRV(profile, runtimeInfo, program, bindings, fmt::format("shader_{:016X}", hash))}; + auto spirv{Shader::Backend::SPIRV::EmitSPIRV(profile, runtimeInfo, program, bindings)}; vk::ShaderModuleCreateInfo createInfo{ .pCode = spirv.data(),