N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-22 23:02:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2100 from FreddyFunk/disk-cache-precompiled-file

Browse source 
gl_shader_disk_cache: Improve precompiled shader cache generation speed and size
This commit is contained in:
bunnei 2019-04-30 19:24:01 -04:00 committed by GitHub
commit 79e54abe19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 170 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video_core/renderer_opengl/gl_shader_cache.cpp
View file

@ -363,6 +363,10 @@ void ShaderCacheOpenGL::LoadDiskCache(const std::atomic_bool& stop_loading,
if (stop_loading) if (stop_loading)
return; return;
// Track if precompiled cache was altered during loading to know if we have to serialize the
// virtual precompiled cache file back to the hard drive
bool precompiled_cache_altered = false;
// Build shaders // Build shaders
if (callback) if (callback)
callback(VideoCore::LoadCallbackStage::Build, 0, usages.size()); callback(VideoCore::LoadCallbackStage::Build, 0, usages.size());
@ -384,6 +388,7 @@ void ShaderCacheOpenGL::LoadDiskCache(const std::atomic_bool& stop_loading,
if (!shader) { if (!shader) {
// Invalidate the precompiled cache if a shader dumped shader was rejected // Invalidate the precompiled cache if a shader dumped shader was rejected
disk_cache.InvalidatePrecompiled(); disk_cache.InvalidatePrecompiled();
precompiled_cache_altered = true;
dumps.clear(); dumps.clear();
} }
} }
@ -405,8 +410,13 @@ void ShaderCacheOpenGL::LoadDiskCache(const std::atomic_bool& stop_loading,
if (dumps.find(usage) == dumps.end()) { if (dumps.find(usage) == dumps.end()) {
const auto& program = precompiled_programs.at(usage); const auto& program = precompiled_programs.at(usage);
disk_cache.SaveDump(usage, program->handle); disk_cache.SaveDump(usage, program->handle);
precompiled_cache_altered = true;
} }
} }
if (precompiled_cache_altered) {
disk_cache.SaveVirtualPrecompiledFile();
}
} }
CachedProgram ShaderCacheOpenGL::GeneratePrecompiledProgram( CachedProgram ShaderCacheOpenGL::GeneratePrecompiledProgram(

239
src/video_core/renderer_opengl/gl_shader_disk_cache.cpp
View file

@ -104,7 +104,8 @@ bool ShaderDiskCacheRaw::Save(FileUtil::IOFile& file) const {
return true; return true;
} }
ShaderDiskCacheOpenGL::ShaderDiskCacheOpenGL(Core::System& system) : system{system} {} ShaderDiskCacheOpenGL::ShaderDiskCacheOpenGL(Core::System& system)
: system{system}, precompiled_cache_virtual_file_offset{0} {}
std::optional<std::pair<std::vector<ShaderDiskCacheRaw>, std::vector<ShaderDiskCacheUsage>>> std::optional<std::pair<std::vector<ShaderDiskCacheRaw>, std::vector<ShaderDiskCacheUsage>>>
ShaderDiskCacheOpenGL::LoadTransferable() { ShaderDiskCacheOpenGL::LoadTransferable() {
@ -177,6 +178,7 @@ ShaderDiskCacheOpenGL::LoadTransferable() {
return {}; return {};
} }
} }
return {{raws, usages}}; return {{raws, usages}};
} }
@ -208,59 +210,64 @@ ShaderDiskCacheOpenGL::LoadPrecompiled() {
std::optional<std::pair<std::unordered_map<u64, ShaderDiskCacheDecompiled>, std::optional<std::pair<std::unordered_map<u64, ShaderDiskCacheDecompiled>,
std::unordered_map<ShaderDiskCacheUsage, ShaderDiskCacheDump>>> std::unordered_map<ShaderDiskCacheUsage, ShaderDiskCacheDump>>>
ShaderDiskCacheOpenGL::LoadPrecompiledFile(FileUtil::IOFile& file) { ShaderDiskCacheOpenGL::LoadPrecompiledFile(FileUtil::IOFile& file) {
// Read compressed file from disk and decompress to virtual precompiled cache file
std::vector<u8> compressed(file.GetSize());
file.ReadBytes(compressed.data(), compressed.size());
const std::vector<u8> decompressed = Common::Compression::DecompressDataZSTD(compressed);
SaveArrayToPrecompiled(decompressed.data(), decompressed.size());
precompiled_cache_virtual_file_offset = 0;
ShaderCacheVersionHash file_hash{}; ShaderCacheVersionHash file_hash{};
if (file.ReadArray(file_hash.data(), file_hash.size()) != file_hash.size()) { if (!LoadArrayFromPrecompiled(file_hash.data(), file_hash.size())) {
precompiled_cache_virtual_file_offset = 0;
return {}; return {};
} }
if (GetShaderCacheVersionHash() != file_hash) { if (GetShaderCacheVersionHash() != file_hash) {
LOG_INFO(Render_OpenGL, "Precompiled cache is from another version of the emulator"); LOG_INFO(Render_OpenGL, "Precompiled cache is from another version of the emulator");
precompiled_cache_virtual_file_offset = 0;
return {}; return {};
} }
std::unordered_map<u64, ShaderDiskCacheDecompiled> decompiled; std::unordered_map<u64, ShaderDiskCacheDecompiled> decompiled;
std::unordered_map<ShaderDiskCacheUsage, ShaderDiskCacheDump> dumps; std::unordered_map<ShaderDiskCacheUsage, ShaderDiskCacheDump> dumps;
while (file.Tell() < file.GetSize()) { while (precompiled_cache_virtual_file_offset < precompiled_cache_virtual_file.GetSize()) {
PrecompiledEntryKind kind{}; PrecompiledEntryKind kind{};
if (file.ReadBytes(&kind, sizeof(u32)) != sizeof(u32)) { if (!LoadObjectFromPrecompiled(kind)) {
return {}; return {};
} }
switch (kind) { switch (kind) {
case PrecompiledEntryKind::Decompiled: { case PrecompiledEntryKind::Decompiled: {
u64 unique_identifier{}; u64 unique_identifier{};
if (file.ReadBytes(&unique_identifier, sizeof(u64)) != sizeof(u64)) if (!LoadObjectFromPrecompiled(unique_identifier)) {
return {}; return {};
}
const auto entry = LoadDecompiledEntry(file); const auto entry = LoadDecompiledEntry();
if (!entry) if (!entry) {
return {}; return {};
}
decompiled.insert({unique_identifier, std::move(*entry)}); decompiled.insert({unique_identifier, std::move(*entry)});
break; break;
} }
case PrecompiledEntryKind::Dump: { case PrecompiledEntryKind::Dump: {
ShaderDiskCacheUsage usage; ShaderDiskCacheUsage usage;
if (file.ReadBytes(&usage, sizeof(usage)) != sizeof(usage)) if (!LoadObjectFromPrecompiled(usage)) {
return {}; return {};
}
ShaderDiskCacheDump dump; ShaderDiskCacheDump dump;
if (file.ReadBytes(&dump.binary_format, sizeof(u32)) != sizeof(u32)) if (!LoadObjectFromPrecompiled(dump.binary_format)) {
return {}; return {};
}
u32 binary_length{}; u32 binary_length{};
u32 compressed_size{}; if (!LoadObjectFromPrecompiled(binary_length)) {
if (file.ReadBytes(&binary_length, sizeof(u32)) != sizeof(u32) ||
file.ReadBytes(&compressed_size, sizeof(u32)) != sizeof(u32)) {
return {}; return {};
} }
std::vector<u8> compressed_binary(compressed_size); dump.binary.resize(binary_length);
if (file.ReadArray(compressed_binary.data(), compressed_binary.size()) != if (!LoadArrayFromPrecompiled(dump.binary.data(), dump.binary.size())) {
compressed_binary.size()) {
return {};
}
dump.binary = Common::Compression::DecompressDataZSTD(compressed_binary);
if (dump.binary.empty()) {
return {}; return {};
} }
@ -274,45 +281,41 @@ ShaderDiskCacheOpenGL::LoadPrecompiledFile(FileUtil::IOFile& file) {
return {{decompiled, dumps}}; return {{decompiled, dumps}};
} }
std::optional<ShaderDiskCacheDecompiled> ShaderDiskCacheOpenGL::LoadDecompiledEntry( std::optional<ShaderDiskCacheDecompiled> ShaderDiskCacheOpenGL::LoadDecompiledEntry() {
FileUtil::IOFile& file) {
u32 code_size{}; u32 code_size{};
u32 compressed_code_size{}; if (!LoadObjectFromPrecompiled(code_size)) {
if (file.ReadBytes(&code_size, sizeof(u32)) != sizeof(u32) ||
file.ReadBytes(&compressed_code_size, sizeof(u32)) != sizeof(u32)) {
return {}; return {};
} }
std::vector<u8> compressed_code(compressed_code_size); std::vector<u8> code(code_size);
if (file.ReadArray(compressed_code.data(), compressed_code.size()) != compressed_code.size()) { if (!LoadArrayFromPrecompiled(code.data(), code.size())) {
return {}; return {};
} }
const std::vector<u8> code = Common::Compression::DecompressDataZSTD(compressed_code);
if (code.empty()) {
return {};
}
ShaderDiskCacheDecompiled entry; ShaderDiskCacheDecompiled entry;
entry.code = std::string(reinterpret_cast<const char*>(code.data()), code_size); entry.code = std::string(reinterpret_cast<const char*>(code.data()), code_size);
u32 const_buffers_count{}; u32 const_buffers_count{};
if (file.ReadBytes(&const_buffers_count, sizeof(u32)) != sizeof(u32)) if (!LoadObjectFromPrecompiled(const_buffers_count)) {
return {}; return {};
}
for (u32 i = 0; i < const_buffers_count; ++i) { for (u32 i = 0; i < const_buffers_count; ++i) {
u32 max_offset{}; u32 max_offset{};
u32 index{}; u32 index{};
u8 is_indirect{}; u8 is_indirect{};
if (file.ReadBytes(&max_offset, sizeof(u32)) != sizeof(u32) || if (!LoadObjectFromPrecompiled(max_offset) || !LoadObjectFromPrecompiled(index) ||
file.ReadBytes(&index, sizeof(u32)) != sizeof(u32) || !LoadObjectFromPrecompiled(is_indirect)) {
file.ReadBytes(&is_indirect, sizeof(u8)) != sizeof(u8)) {
return {}; return {};
} }
entry.entries.const_buffers.emplace_back(max_offset, is_indirect != 0, index); entry.entries.const_buffers.emplace_back(max_offset, is_indirect != 0, index);
} }
u32 samplers_count{}; u32 samplers_count{};
if (file.ReadBytes(&samplers_count, sizeof(u32)) != sizeof(u32)) if (!LoadObjectFromPrecompiled(samplers_count)) {
return {}; return {};
}
for (u32 i = 0; i < samplers_count; ++i) { for (u32 i = 0; i < samplers_count; ++i) {
u64 offset{}; u64 offset{};
u64 index{}; u64 index{};
@ -320,12 +323,9 @@ std::optional<ShaderDiskCacheDecompiled> ShaderDiskCacheOpenGL::LoadDecompiledEn
u8 is_array{}; u8 is_array{};
u8 is_shadow{}; u8 is_shadow{};
u8 is_bindless{}; u8 is_bindless{};
if (file.ReadBytes(&offset, sizeof(u64)) != sizeof(u64) || if (!LoadObjectFromPrecompiled(offset) || !LoadObjectFromPrecompiled(index) ||
file.ReadBytes(&index, sizeof(u64)) != sizeof(u64) || !LoadObjectFromPrecompiled(type) || !LoadObjectFromPrecompiled(is_array) ||
file.ReadBytes(&type, sizeof(u32)) != sizeof(u32) || !LoadObjectFromPrecompiled(is_shadow) || !LoadObjectFromPrecompiled(is_bindless)) {
file.ReadBytes(&is_array, sizeof(u8)) != sizeof(u8) ||
file.ReadBytes(&is_shadow, sizeof(u8)) != sizeof(u8) ||
file.ReadBytes(&is_bindless, sizeof(u8)) != sizeof(u8)) {
return {}; return {};
} }
entry.entries.samplers.emplace_back(static_cast<std::size_t>(offset), entry.entries.samplers.emplace_back(static_cast<std::size_t>(offset),
@ -335,17 +335,17 @@ std::optional<ShaderDiskCacheDecompiled> ShaderDiskCacheOpenGL::LoadDecompiledEn
} }
u32 global_memory_count{}; u32 global_memory_count{};
if (file.ReadBytes(&global_memory_count, sizeof(u32)) != sizeof(u32)) if (!LoadObjectFromPrecompiled(global_memory_count)) {
return {}; return {};
}
for (u32 i = 0; i < global_memory_count; ++i) { for (u32 i = 0; i < global_memory_count; ++i) {
u32 cbuf_index{}; u32 cbuf_index{};
u32 cbuf_offset{}; u32 cbuf_offset{};
u8 is_read{}; u8 is_read{};
u8 is_written{}; u8 is_written{};
if (file.ReadBytes(&cbuf_index, sizeof(u32)) != sizeof(u32) || if (!LoadObjectFromPrecompiled(cbuf_index) || !LoadObjectFromPrecompiled(cbuf_offset) ||
file.ReadBytes(&cbuf_offset, sizeof(u32)) != sizeof(u32) || !LoadObjectFromPrecompiled(is_read) || !LoadObjectFromPrecompiled(is_written)) {
file.ReadBytes(&is_read, sizeof(u8)) != sizeof(u8) ||
file.ReadBytes(&is_written, sizeof(u8)) != sizeof(u8)) {
return {}; return {};
} }
entry.entries.global_memory_entries.emplace_back(cbuf_index, cbuf_offset, is_read != 0, entry.entries.global_memory_entries.emplace_back(cbuf_index, cbuf_offset, is_read != 0,
@ -354,74 +354,81 @@ std::optional<ShaderDiskCacheDecompiled> ShaderDiskCacheOpenGL::LoadDecompiledEn
for (auto& clip_distance : entry.entries.clip_distances) { for (auto& clip_distance : entry.entries.clip_distances) {
u8 clip_distance_raw{}; u8 clip_distance_raw{};
if (file.ReadBytes(&clip_distance_raw, sizeof(u8)) != sizeof(u8)) if (!LoadObjectFromPrecompiled(clip_distance_raw))
return {}; return {};
clip_distance = clip_distance_raw != 0; clip_distance = clip_distance_raw != 0;
} }
u64 shader_length{}; u64 shader_length{};
if (file.ReadBytes(&shader_length, sizeof(u64)) != sizeof(u64)) if (!LoadObjectFromPrecompiled(shader_length)) {
return {}; return {};
}
entry.entries.shader_length = static_cast<std::size_t>(shader_length); entry.entries.shader_length = static_cast<std::size_t>(shader_length);
return entry; return entry;
} }
bool ShaderDiskCacheOpenGL::SaveDecompiledFile(FileUtil::IOFile& file, u64 unique_identifier, bool ShaderDiskCacheOpenGL::SaveDecompiledFile(u64 unique_identifier, const std::string& code,
const std::string& code,
const std::vector<u8>& compressed_code,
const GLShader::ShaderEntries& entries) { const GLShader::ShaderEntries& entries) {
if (file.WriteObject(static_cast<u32>(PrecompiledEntryKind::Decompiled)) != 1 || if (!SaveObjectToPrecompiled(static_cast<u32>(PrecompiledEntryKind::Decompiled)) ||
file.WriteObject(unique_identifier) != 1 || !SaveObjectToPrecompiled(unique_identifier) ||
file.WriteObject(static_cast<u32>(code.size())) != 1 || !SaveObjectToPrecompiled(static_cast<u32>(code.size())) ||
file.WriteObject(static_cast<u32>(compressed_code.size())) != 1 || !SaveArrayToPrecompiled(code.data(), code.size())) {
file.WriteArray(compressed_code.data(), compressed_code.size()) != compressed_code.size()) {
return false; return false;
} }
if (file.WriteObject(static_cast<u32>(entries.const_buffers.size())) != 1) if (!SaveObjectToPrecompiled(static_cast<u32>(entries.const_buffers.size()))) {
return false; return false;
}
for (const auto& cbuf : entries.const_buffers) { for (const auto& cbuf : entries.const_buffers) {
if (file.WriteObject(static_cast<u32>(cbuf.GetMaxOffset())) != 1 || if (!SaveObjectToPrecompiled(static_cast<u32>(cbuf.GetMaxOffset())) ||
file.WriteObject(static_cast<u32>(cbuf.GetIndex())) != 1 || !SaveObjectToPrecompiled(static_cast<u32>(cbuf.GetIndex())) ||
file.WriteObject(static_cast<u8>(cbuf.IsIndirect() ? 1 : 0)) != 1) { !SaveObjectToPrecompiled(static_cast<u8>(cbuf.IsIndirect() ? 1 : 0))) {
return false; return false;
} }
} }
if (file.WriteObject(static_cast<u32>(entries.samplers.size())) != 1) if (!SaveObjectToPrecompiled(static_cast<u32>(entries.samplers.size()))) {
return false; return false;
}
for (const auto& sampler : entries.samplers) { for (const auto& sampler : entries.samplers) {
if (file.WriteObject(static_cast<u64>(sampler.GetOffset())) != 1 || if (!SaveObjectToPrecompiled(static_cast<u64>(sampler.GetOffset())) ||
file.WriteObject(static_cast<u64>(sampler.GetIndex())) != 1 || !SaveObjectToPrecompiled(static_cast<u64>(sampler.GetIndex())) ||
file.WriteObject(static_cast<u32>(sampler.GetType())) != 1 || !SaveObjectToPrecompiled(static_cast<u32>(sampler.GetType())) ||
file.WriteObject(static_cast<u8>(sampler.IsArray() ? 1 : 0)) != 1 || !SaveObjectToPrecompiled(static_cast<u8>(sampler.IsArray() ? 1 : 0)) ||
file.WriteObject(static_cast<u8>(sampler.IsShadow() ? 1 : 0)) != 1 || !SaveObjectToPrecompiled(static_cast<u8>(sampler.IsShadow() ? 1 : 0)) ||
file.WriteObject(static_cast<u8>(sampler.IsBindless() ? 1 : 0)) != 1) { !SaveObjectToPrecompiled(static_cast<u8>(sampler.IsBindless() ? 1 : 0))) {
return false; return false;
} }
} }
if (file.WriteObject(static_cast<u32>(entries.global_memory_entries.size())) != 1) if (!SaveObjectToPrecompiled(static_cast<u32>(entries.global_memory_entries.size()))) {
return false; return false;
}
for (const auto& gmem : entries.global_memory_entries) { for (const auto& gmem : entries.global_memory_entries) {
if (file.WriteObject(static_cast<u32>(gmem.GetCbufIndex())) != 1 || if (!SaveObjectToPrecompiled(static_cast<u32>(gmem.GetCbufIndex())) ||
file.WriteObject(static_cast<u32>(gmem.GetCbufOffset())) != 1 || !SaveObjectToPrecompiled(static_cast<u32>(gmem.GetCbufOffset())) ||
file.WriteObject(static_cast<u8>(gmem.IsRead() ? 1 : 0)) != 1 || !SaveObjectToPrecompiled(static_cast<u8>(gmem.IsRead() ? 1 : 0)) ||
file.WriteObject(static_cast<u8>(gmem.IsWritten() ? 1 : 0)) != 1) { !SaveObjectToPrecompiled(static_cast<u8>(gmem.IsWritten() ? 1 : 0))) {
return false; return false;
} }
} }
for (const bool clip_distance : entries.clip_distances) { for (const bool clip_distance : entries.clip_distances) {
if (file.WriteObject(static_cast<u8>(clip_distance ? 1 : 0)) != 1) if (!SaveObjectToPrecompiled(static_cast<u8>(clip_distance ? 1 : 0))) {
return false; return false;
}
} }
return file.WriteObject(static_cast<u64>(entries.shader_length)) == 1; if (!SaveObjectToPrecompiled(static_cast<u64>(entries.shader_length))) {
return false;
}
return true;
} }
void ShaderDiskCacheOpenGL::InvalidateTransferable() const { void ShaderDiskCacheOpenGL::InvalidateTransferable() {
if (!FileUtil::Delete(GetTransferablePath())) { if (!FileUtil::Delete(GetTransferablePath())) {
LOG_ERROR(Render_OpenGL, "Failed to invalidate transferable file={}", LOG_ERROR(Render_OpenGL, "Failed to invalidate transferable file={}",
GetTransferablePath()); GetTransferablePath());
@ -429,7 +436,10 @@ void ShaderDiskCacheOpenGL::InvalidateTransferable() const {
InvalidatePrecompiled(); InvalidatePrecompiled();
} }
void ShaderDiskCacheOpenGL::InvalidatePrecompiled() const { void ShaderDiskCacheOpenGL::InvalidatePrecompiled() {
// Clear virtaul precompiled cache file
precompiled_cache_virtual_file.Resize(0);
if (!FileUtil::Delete(GetPrecompiledPath())) { if (!FileUtil::Delete(GetPrecompiledPath())) {
LOG_ERROR(Render_OpenGL, "Failed to invalidate precompiled file={}", GetPrecompiledPath()); LOG_ERROR(Render_OpenGL, "Failed to invalidate precompiled file={}", GetPrecompiledPath());
} }
@ -485,22 +495,13 @@ void ShaderDiskCacheOpenGL::SaveDecompiled(u64 unique_identifier, const std::str
if (!IsUsable()) if (!IsUsable())
return; return;
const std::vector<u8> compressed_code{Common::Compression::CompressDataZSTDDefault( if (precompiled_cache_virtual_file.GetSize() == 0) {
reinterpret_cast<const u8*>(code.data()), code.size())}; SavePrecompiledHeaderToVirtualPrecompiledCache();
if (compressed_code.empty()) {
LOG_ERROR(Render_OpenGL, "Failed to compress GLSL code - skipping shader {:016x}",
unique_identifier);
return;
} }
FileUtil::IOFile file = AppendPrecompiledFile(); if (!SaveDecompiledFile(unique_identifier, code, entries)) {
if (!file.IsOpen())
return;
if (!SaveDecompiledFile(file, unique_identifier, code, compressed_code, entries)) {
LOG_ERROR(Render_OpenGL, LOG_ERROR(Render_OpenGL,
"Failed to save decompiled entry to the precompiled file - removing"); "Failed to save decompiled entry to the precompiled file - removing");
file.Close();
InvalidatePrecompiled(); InvalidatePrecompiled();
} }
} }
@ -516,28 +517,13 @@ void ShaderDiskCacheOpenGL::SaveDump(const ShaderDiskCacheUsage& usage, GLuint p
std::vector<u8> binary(binary_length); std::vector<u8> binary(binary_length);
glGetProgramBinary(program, binary_length, nullptr, &binary_format, binary.data()); glGetProgramBinary(program, binary_length, nullptr, &binary_format, binary.data());
const std::vector<u8> compressed_binary = if (!SaveObjectToPrecompiled(static_cast<u32>(PrecompiledEntryKind::Dump)) ||
Common::Compression::CompressDataZSTDDefault(binary.data(), binary.size()); !SaveObjectToPrecompiled(usage) ||
!SaveObjectToPrecompiled(static_cast<u32>(binary_format)) ||
if (compressed_binary.empty()) { !SaveObjectToPrecompiled(static_cast<u32>(binary_length)) ||
LOG_ERROR(Render_OpenGL, "Failed to compress binary program in shader={:016x}", !SaveArrayToPrecompiled(binary.data(), binary.size())) {
usage.unique_identifier);
return;
}
FileUtil::IOFile file = AppendPrecompiledFile();
if (!file.IsOpen())
return;
if (file.WriteObject(static_cast<u32>(PrecompiledEntryKind::Dump)) != 1 ||
file.WriteObject(usage) != 1 || file.WriteObject(static_cast<u32>(binary_format)) != 1 ||
file.WriteObject(static_cast<u32>(binary_length)) != 1 ||
file.WriteObject(static_cast<u32>(compressed_binary.size())) != 1 ||
file.WriteArray(compressed_binary.data(), compressed_binary.size()) !=
compressed_binary.size()) {
LOG_ERROR(Render_OpenGL, "Failed to save binary program file in shader={:016x} - removing", LOG_ERROR(Render_OpenGL, "Failed to save binary program file in shader={:016x} - removing",
usage.unique_identifier); usage.unique_identifier);
file.Close();
InvalidatePrecompiled(); InvalidatePrecompiled();
return; return;
} }
@ -570,28 +556,33 @@ FileUtil::IOFile ShaderDiskCacheOpenGL::AppendTransferableFile() const {
return file; return file;
} }
FileUtil::IOFile ShaderDiskCacheOpenGL::AppendPrecompiledFile() const { void ShaderDiskCacheOpenGL::SavePrecompiledHeaderToVirtualPrecompiledCache() {
if (!EnsureDirectories()) const auto hash{GetShaderCacheVersionHash()};
return {}; if (!SaveArrayToPrecompiled(hash.data(), hash.size())) {
LOG_ERROR(
Render_OpenGL,
"Failed to write precompiled cache version hash to virtual precompiled cache file");
}
}
void ShaderDiskCacheOpenGL::SaveVirtualPrecompiledFile() {
precompiled_cache_virtual_file_offset = 0;
const std::vector<u8>& uncompressed = precompiled_cache_virtual_file.ReadAllBytes();
const std::vector<u8>& compressed =
Common::Compression::CompressDataZSTDDefault(uncompressed.data(), uncompressed.size());
const auto precompiled_path{GetPrecompiledPath()}; const auto precompiled_path{GetPrecompiledPath()};
const bool existed = FileUtil::Exists(precompiled_path); FileUtil::IOFile file(precompiled_path, "wb");
FileUtil::IOFile file(precompiled_path, "ab");
if (!file.IsOpen()) { if (!file.IsOpen()) {
LOG_ERROR(Render_OpenGL, "Failed to open precompiled cache in path={}", precompiled_path); LOG_ERROR(Render_OpenGL, "Failed to open precompiled cache in path={}", precompiled_path);
return {}; return;
} }
if (file.WriteBytes(compressed.data(), compressed.size()) != compressed.size()) {
if (!existed || file.GetSize() == 0) { LOG_ERROR(Render_OpenGL, "Failed to write precompiled cache version in path={}",
const auto hash{GetShaderCacheVersionHash()}; precompiled_path);
if (file.WriteArray(hash.data(), hash.size()) != hash.size()) { return;
LOG_ERROR(Render_OpenGL, "Failed to write precompiled cache version hash in path={}",
precompiled_path);
return {};
}
} }
return file;
} }
bool ShaderDiskCacheOpenGL::EnsureDirectories() const { bool ShaderDiskCacheOpenGL::EnsureDirectories() const {

54
src/video_core/renderer_opengl/gl_shader_disk_cache.h
View file

@ -16,6 +16,7 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "core/file_sys/vfs_vector.h"
#include "video_core/engines/maxwell_3d.h" #include "video_core/engines/maxwell_3d.h"
#include "video_core/renderer_opengl/gl_shader_gen.h" #include "video_core/renderer_opengl/gl_shader_gen.h"
@ -172,10 +173,10 @@ public:
LoadPrecompiled(); LoadPrecompiled();
/// Removes the transferable (and precompiled) cache file. /// Removes the transferable (and precompiled) cache file.
void InvalidateTransferable() const; void InvalidateTransferable();
/// Removes the precompiled cache file. /// Removes the precompiled cache file and clears virtual precompiled cache file.
void InvalidatePrecompiled() const; void InvalidatePrecompiled();
/// Saves a raw dump to the transferable file. Checks for collisions. /// Saves a raw dump to the transferable file. Checks for collisions.
void SaveRaw(const ShaderDiskCacheRaw& entry); void SaveRaw(const ShaderDiskCacheRaw& entry);
@ -190,18 +191,21 @@ public:
/// Saves a dump entry to the precompiled file. Does not check for collisions. /// Saves a dump entry to the precompiled file. Does not check for collisions.
void SaveDump(const ShaderDiskCacheUsage& usage, GLuint program); void SaveDump(const ShaderDiskCacheUsage& usage, GLuint program);
/// Serializes virtual precompiled shader cache file to real file
void SaveVirtualPrecompiledFile();
private: private:
/// Loads the transferable cache. Returns empty on failure. /// Loads the transferable cache. Returns empty on failure.
std::optional<std::pair<std::unordered_map<u64, ShaderDiskCacheDecompiled>, std::optional<std::pair<std::unordered_map<u64, ShaderDiskCacheDecompiled>,
std::unordered_map<ShaderDiskCacheUsage, ShaderDiskCacheDump>>> std::unordered_map<ShaderDiskCacheUsage, ShaderDiskCacheDump>>>
LoadPrecompiledFile(FileUtil::IOFile& file); LoadPrecompiledFile(FileUtil::IOFile& file);
/// Loads a decompiled cache entry from the passed file. Returns empty on failure. /// Loads a decompiled cache entry from m_precompiled_cache_virtual_file. Returns empty on
std::optional<ShaderDiskCacheDecompiled> LoadDecompiledEntry(FileUtil::IOFile& file); /// failure.
std::optional<ShaderDiskCacheDecompiled> LoadDecompiledEntry();
/// Saves a decompiled entry to the passed file. Returns true on success. /// Saves a decompiled entry to the passed file. Returns true on success.
bool SaveDecompiledFile(FileUtil::IOFile& file, u64 unique_identifier, const std::string& code, bool SaveDecompiledFile(u64 unique_identifier, const std::string& code,
const std::vector<u8>& compressed_code,
const GLShader::ShaderEntries& entries); const GLShader::ShaderEntries& entries);
/// Returns if the cache can be used /// Returns if the cache can be used
@ -210,8 +214,8 @@ private:
/// Opens current game's transferable file and write it's header if it doesn't exist /// Opens current game's transferable file and write it's header if it doesn't exist
FileUtil::IOFile AppendTransferableFile() const; FileUtil::IOFile AppendTransferableFile() const;
/// Opens current game's precompiled file and write it's header if it doesn't exist /// Save precompiled header to precompiled_cache_in_memory
FileUtil::IOFile AppendPrecompiledFile() const; void SavePrecompiledHeaderToVirtualPrecompiledCache();
/// Create shader disk cache directories. Returns true on success. /// Create shader disk cache directories. Returns true on success.
bool EnsureDirectories() const; bool EnsureDirectories() const;
@ -234,10 +238,42 @@ private:
/// Get current game's title id /// Get current game's title id
std::string GetTitleID() const; std::string GetTitleID() const;
template <typename T>
bool SaveArrayToPrecompiled(const T* data, std::size_t length) {
const std::size_t write_length = precompiled_cache_virtual_file.WriteArray(
data, length, precompiled_cache_virtual_file_offset);
precompiled_cache_virtual_file_offset += write_length;
return write_length == sizeof(T) * length;
}
template <typename T>
bool LoadArrayFromPrecompiled(T* data, std::size_t length) {
const std::size_t read_length = precompiled_cache_virtual_file.ReadArray(
data, length, precompiled_cache_virtual_file_offset);
precompiled_cache_virtual_file_offset += read_length;
return read_length == sizeof(T) * length;
}
template <typename T>
bool SaveObjectToPrecompiled(const T& object) {
return SaveArrayToPrecompiled(&object, 1);
}
template <typename T>
bool LoadObjectFromPrecompiled(T& object) {
return LoadArrayFromPrecompiled(&object, 1);
}
// Copre system // Copre system
Core::System& system; Core::System& system;
// Stored transferable shaders // Stored transferable shaders
std::map<u64, std::unordered_set<ShaderDiskCacheUsage>> transferable; std::map<u64, std::unordered_set<ShaderDiskCacheUsage>> transferable;
// Stores whole precompiled cache which will be read from or saved to the precompiled chache
// file
FileSys::VectorVfsFile precompiled_cache_virtual_file;
// Stores the current offset of the precompiled cache file for IO purposes
std::size_t precompiled_cache_virtual_file_offset;
// The cache has been loaded at boot // The cache has been loaded at boot
bool tried_to_load{}; bool tried_to_load{};
}; };