CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

custom_tex_manager: Allow old hash in the dumper (#6832)

Browse Source
This commit is contained in:
GPUCode
2023-08-01 20:38:51 +03:00
committed by GitHub
parent 35e208b447
commit baf3ea4beb
5 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/video_core/rasterizer_cache/rasterizer_cache.h
View File

@@ -993,7 +993,7 @@ void RasterizerCache<T>::UploadSurface(Surface& surface, SurfaceInterval interva
runtime.NeedsConversion(surface.pixel_format));
if (dump_textures && False(surface.flags & SurfaceFlagBits::Custom)) {
const u64 hash = Common::ComputeHash64(upload_data.data(), upload_data.size());
const u64 hash = ComputeHash(load_info, upload_data);
const u32 level = surface.LevelOf(load_info.addr);
custom_tex_manager.DumpTexture(load_info, level, upload_data, hash);
}
@@ -1007,6 +1007,20 @@ void RasterizerCache<T>::UploadSurface(Surface& surface, SurfaceInterval interva
surface.Upload(upload, staging);
}
template <class T>
u64 RasterizerCache<T>::ComputeHash(const SurfaceParams& load_info, std::span<u8> upload_data) {
if (!custom_tex_manager.UseNewHash()) {
const u32 width = load_info.width;
const u32 height = load_info.height;
const u32 bpp = GetFormatBytesPerPixel(load_info.pixel_format);
auto decoded = std::vector<u8>(width * height * bpp);
DecodeTexture(load_info, load_info.addr, load_info.end, upload_data, decoded, false);
return Common::ComputeHash64(decoded.data(), decoded.size());
} else {
return Common::ComputeHash64(upload_data.data(), upload_data.size());
}
}
template <class T>
bool RasterizerCache<T>::UploadCustomSurface(SurfaceId surface_id, SurfaceInterval interval) {
MICROPROFILE_SCOPE(RasterizerCache_UploadSurface);
@@ -1021,18 +1035,7 @@ bool RasterizerCache<T>::UploadCustomSurface(SurfaceId surface_id, SurfaceInterv
}
const auto upload_data = source_ptr.GetWriteBytes(load_info.end - load_info.addr);
const u64 hash = [&] {
if (!custom_tex_manager.UseNewHash()) {
const u32 width = load_info.width;
const u32 height = load_info.height;
const u32 bpp = surface.GetInternalBytesPerPixel();
auto decoded = std::vector<u8>(width * height * bpp);
DecodeTexture(load_info, load_info.addr, load_info.end, upload_data, decoded, false);
return Common::ComputeHash64(decoded.data(), decoded.size());
} else {
return Common::ComputeHash64(upload_data.data(), upload_data.size());
}
}();
const u64 hash = ComputeHash(load_info, upload_data);
const u32 level = surface.LevelOf(load_info.addr);
Material* material = custom_tex_manager.GetMaterial(hash);

4
src/video_core/rasterizer_cache/rasterizer_cache_base.h
View File

@@ -7,6 +7,7 @@
#include <functional>
#include <list>
#include <optional>
#include <span>
#include <unordered_map>
#include <vector>
#include <boost/icl/interval_map.hpp>
@@ -167,6 +168,9 @@ private:
/// Transfers ownership of a memory region from src_surface to dest_surface
void DuplicateSurface(SurfaceId src_id, SurfaceId dst_id);
/// Computes the hash of the provided texture data.
u64 ComputeHash(const SurfaceParams& load_info, std::span<u8> upload_data);
/// Update surface's texture for given region when necessary
void ValidateSurface(SurfaceId surface, PAddr addr, u32 size);