From 349ec14ec3a069f156877ca0a471fb46f4593d14 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 4 Jan 2022 04:04:27 +0100 Subject: [PATCH] early-access version 2370 --- README.md | 2 +- src/video_core/shader_environment.cpp | 6 +++--- src/video_core/shader_environment.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b73e4e4c4..a6fbdef3e 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2369. +This is the source code for early-access 2370. ## Legal Notice diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp index c47f5aa8b..7d3ae0de4 100755 --- a/src/video_core/shader_environment.cpp +++ b/src/video_core/shader_environment.cpp @@ -59,7 +59,7 @@ static Shader::TextureType ConvertType(const Tegra::Texture::TICEntry& entry) { } } -static std::string_view StageToPreffix(Shader::Stage stage) { +static std::string_view StageToPrefix(Shader::Stage stage) { switch (stage) { case Shader::Stage::VertexB: return "VB"; @@ -83,12 +83,12 @@ static std::string_view StageToPreffix(Shader::Stage stage) { static void DumpImpl(u64 hash, const u64* code, u32 read_highest, u32 read_lowest, u32 initial_offset, Shader::Stage stage) { const auto shader_dir{Common::FS::GetYuzuPath(Common::FS::YuzuPath::DumpDir)}; - const auto base_dir{shader_dir / fmt::format("shaders")}; + const auto base_dir{shader_dir / "shaders"}; if (!Common::FS::CreateDir(shader_dir) || !Common::FS::CreateDir(base_dir)) { LOG_ERROR(Common_Filesystem, "Failed to create shader dump directories"); return; } - const auto prefix = StageToPreffix(stage); + const auto prefix = StageToPrefix(stage); const auto name{base_dir / fmt::format("{}{:016x}.ash", prefix, hash)}; const size_t real_size = read_highest - read_lowest + initial_offset; const size_t padding_needed = ((32 - (real_size % 32)) % 32); diff --git a/src/video_core/shader_environment.h b/src/video_core/shader_environment.h index 374429fed..aae762b27 100755 --- a/src/video_core/shader_environment.h +++ b/src/video_core/shader_environment.h @@ -57,7 +57,7 @@ public: [[nodiscard]] u64 CalculateHash() const; - void Dump(u64 hash); + void Dump(u64 hash) override; void Serialize(std::ofstream& file) const;