mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 22:09:19 -07:00
3b9020dc9b
This fixes issue 6563: https://code.google.com/p/dolphin-emu/issues/detail?id=6563 This PR adds a 2nd map to texture cache, which uses the hash as key. Cache entries from this new map are used only if the address matches or if the texture was fully hashed. This restriction avoids false positive cache hits. This results in a possible situation where safe texture cache accuracy could be faster than the fast one. Small textures means up to 1KB for fast texture cache accuracy, 4KB for medium, and all textures for safe accuracy. Since this adds a small overhead to all texture cache handling, some regression testing would be nice. Games, which use a lot of textures the same time, should be affected the most.
168 lines
4.9 KiB
C++
168 lines
4.9 KiB
C++
// Copyright 2010 Dolphin Emulator Project
|
|
// Licensed under GPLv2+
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include <functional>
|
|
#include <map>
|
|
#include <unordered_map>
|
|
|
|
#include "Common/CommonTypes.h"
|
|
#include "Common/Thread.h"
|
|
|
|
#include "VideoCommon/BPMemory.h"
|
|
#include "VideoCommon/TextureDecoder.h"
|
|
#include "VideoCommon/VideoCommon.h"
|
|
|
|
struct VideoConfig;
|
|
|
|
class TextureCache
|
|
{
|
|
public:
|
|
struct TCacheEntryConfig
|
|
{
|
|
TCacheEntryConfig() : width(0), height(0), levels(1), layers(1), rendertarget(false) {}
|
|
|
|
u32 width, height;
|
|
u32 levels, layers;
|
|
bool rendertarget;
|
|
|
|
bool operator == (const TCacheEntryConfig& b) const
|
|
{
|
|
return width == b.width && height == b.height && levels == b.levels && layers == b.layers && rendertarget == b.rendertarget;
|
|
}
|
|
|
|
struct Hasher : std::hash<u64>
|
|
{
|
|
size_t operator()(const TextureCache::TCacheEntryConfig& c) const
|
|
{
|
|
u64 id = (u64)c.rendertarget << 63 | (u64)c.layers << 48 | (u64)c.levels << 32 | (u64)c.height << 16 | (u64)c.width;
|
|
return std::hash<u64>::operator()(id);
|
|
}
|
|
};
|
|
};
|
|
struct TCacheEntryBase
|
|
{
|
|
const TCacheEntryConfig config;
|
|
|
|
// common members
|
|
u32 addr;
|
|
u32 size_in_bytes;
|
|
u64 hash;
|
|
u32 format;
|
|
bool is_efb_copy;
|
|
bool is_custom_tex;
|
|
|
|
unsigned int native_width, native_height; // Texture dimensions from the GameCube's point of view
|
|
unsigned int native_levels;
|
|
|
|
// used to delete textures which haven't been used for TEXTURE_KILL_THRESHOLD frames
|
|
int frameCount;
|
|
|
|
// Keep an iterator to the entry in textures_by_hash, so it does not need to be searched when removing the cache entry
|
|
std::multimap<u64, TCacheEntryBase*>::iterator textures_by_hash_iter;
|
|
|
|
void SetGeneralParameters(u32 _addr, u32 _size, u32 _format)
|
|
{
|
|
addr = _addr;
|
|
size_in_bytes = _size;
|
|
format = _format;
|
|
}
|
|
|
|
void SetDimensions(unsigned int _native_width, unsigned int _native_height, unsigned int _native_levels)
|
|
{
|
|
native_width = _native_width;
|
|
native_height = _native_height;
|
|
native_levels = _native_levels;
|
|
}
|
|
|
|
void SetHashes(u64 _hash)
|
|
{
|
|
hash = _hash;
|
|
}
|
|
|
|
TCacheEntryBase(const TCacheEntryConfig& c) : config(c) {}
|
|
virtual ~TCacheEntryBase();
|
|
|
|
virtual void Bind(unsigned int stage) = 0;
|
|
virtual bool Save(const std::string& filename, unsigned int level) = 0;
|
|
|
|
virtual void Load(unsigned int width, unsigned int height,
|
|
unsigned int expanded_width, unsigned int level) = 0;
|
|
virtual void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
|
|
PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect,
|
|
bool isIntensity, bool scaleByHalf, unsigned int cbufid,
|
|
const float *colmat) = 0;
|
|
|
|
bool OverlapsMemoryRange(u32 range_address, u32 range_size) const;
|
|
|
|
bool IsEfbCopy() const { return is_efb_copy; }
|
|
};
|
|
|
|
virtual ~TextureCache(); // needs virtual for DX11 dtor
|
|
|
|
static void OnConfigChanged(VideoConfig& config);
|
|
|
|
// Removes textures which aren't used for more than TEXTURE_KILL_THRESHOLD frames,
|
|
// frameCount is the current frame number.
|
|
static void Cleanup(int _frameCount);
|
|
|
|
static void Invalidate();
|
|
static void MakeRangeDynamic(u32 start_address, u32 size);
|
|
|
|
virtual TCacheEntryBase* CreateTexture(const TCacheEntryConfig& config) = 0;
|
|
|
|
virtual void CompileShaders() = 0; // currently only implemented by OGL
|
|
virtual void DeleteShaders() = 0; // currently only implemented by OGL
|
|
|
|
static TCacheEntryBase* Load(const u32 stage);
|
|
static void UnbindTextures();
|
|
static void BindTextures();
|
|
static void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, PEControl::PixelFormat srcFormat,
|
|
const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf);
|
|
|
|
static void RequestInvalidateTextureCache();
|
|
|
|
virtual void ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format) = 0;
|
|
|
|
protected:
|
|
TextureCache();
|
|
|
|
static GC_ALIGNED16(u8 *temp);
|
|
static size_t temp_size;
|
|
|
|
private:
|
|
typedef std::multimap<u64, TCacheEntryBase*> TexCache;
|
|
typedef std::unordered_multimap<TCacheEntryConfig, TCacheEntryBase*, TCacheEntryConfig::Hasher> TexPool;
|
|
|
|
static void DumpTexture(TCacheEntryBase* entry, std::string basename, unsigned int level);
|
|
static void CheckTempSize(size_t required_size);
|
|
|
|
static TCacheEntryBase* AllocateTexture(const TCacheEntryConfig& config);
|
|
static TexCache::iterator RemoveTextureFromCache(TexCache::iterator t_iter);
|
|
static void FreeTexture(TCacheEntryBase* entry);
|
|
|
|
static TCacheEntryBase* ReturnEntry(unsigned int stage, TCacheEntryBase* entry);
|
|
|
|
static TexCache textures_by_address;
|
|
static TexCache textures_by_hash;
|
|
static TexPool texture_pool;
|
|
static TCacheEntryBase* bound_textures[8];
|
|
|
|
// Backup configuration values
|
|
static struct BackupConfig
|
|
{
|
|
int s_colorsamples;
|
|
bool s_texfmt_overlay;
|
|
bool s_texfmt_overlay_center;
|
|
bool s_hires_textures;
|
|
bool s_cache_hires_textures;
|
|
bool s_copy_cache_enable;
|
|
bool s_stereo_3d;
|
|
bool s_efb_mono_depth;
|
|
} backup_config;
|
|
};
|
|
|
|
extern TextureCache *g_texture_cache;
|