mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 06:39:46 -06:00
Reformat all the things. Have fun with merge conflicts.
This commit is contained in:
@ -13,46 +13,39 @@
|
||||
class HiresTexture
|
||||
{
|
||||
public:
|
||||
using SOILPointer = std::unique_ptr<u8, void(*)(unsigned char*)>;
|
||||
using SOILPointer = std::unique_ptr<u8, void (*)(unsigned char*)>;
|
||||
|
||||
static void Init();
|
||||
static void Update();
|
||||
static void Shutdown();
|
||||
static void Init();
|
||||
static void Update();
|
||||
static void Shutdown();
|
||||
|
||||
static std::shared_ptr<HiresTexture> Search(
|
||||
const u8* texture, size_t texture_size,
|
||||
const u8* tlut, size_t tlut_size,
|
||||
u32 width, u32 height,
|
||||
int format, bool has_mipmaps
|
||||
);
|
||||
static std::shared_ptr<HiresTexture> Search(const u8* texture, size_t texture_size,
|
||||
const u8* tlut, size_t tlut_size, u32 width,
|
||||
u32 height, int format, bool has_mipmaps);
|
||||
|
||||
static std::string GenBaseName(
|
||||
const u8* texture, size_t texture_size,
|
||||
const u8* tlut, size_t tlut_size,
|
||||
u32 width, u32 height,
|
||||
int format, bool has_mipmaps,
|
||||
bool dump = false
|
||||
);
|
||||
static std::string GenBaseName(const u8* texture, size_t texture_size, const u8* tlut,
|
||||
size_t tlut_size, u32 width, u32 height, int format,
|
||||
bool has_mipmaps, bool dump = false);
|
||||
|
||||
~HiresTexture();
|
||||
~HiresTexture();
|
||||
|
||||
struct Level
|
||||
{
|
||||
Level();
|
||||
struct Level
|
||||
{
|
||||
Level();
|
||||
|
||||
SOILPointer data;
|
||||
size_t data_size = 0;
|
||||
u32 width = 0;
|
||||
u32 height = 0;
|
||||
};
|
||||
std::vector<Level> m_levels;
|
||||
SOILPointer data;
|
||||
size_t data_size = 0;
|
||||
u32 width = 0;
|
||||
u32 height = 0;
|
||||
};
|
||||
std::vector<Level> m_levels;
|
||||
|
||||
private:
|
||||
static std::unique_ptr<HiresTexture> Load(const std::string& base_filename, u32 width, u32 height);
|
||||
static void Prefetch();
|
||||
static std::unique_ptr<HiresTexture> Load(const std::string& base_filename, u32 width,
|
||||
u32 height);
|
||||
static void Prefetch();
|
||||
|
||||
static std::string GetTextureDirectory(const std::string& game_id);
|
||||
|
||||
HiresTexture() {}
|
||||
static std::string GetTextureDirectory(const std::string& game_id);
|
||||
|
||||
HiresTexture() {}
|
||||
};
|
||||
|
Reference in New Issue
Block a user