Compare commits

..

No commits in common. "839200b71736b1d9b2da57fc57b3a447006d105a" and "a80bd84a4a04821ef126a07666b187b7c1ad08ef" have entirely different histories.

2 changed files with 11 additions and 1 deletions

@ -1 +1 @@
Subproject commit 0fd6d05b8a0ec5daae313ad9e8504812ec31775d Subproject commit ec511c99d266bd6b7c770c36ca6c025b306d481c

View File

@ -28,6 +28,10 @@
#include "ovl_patches.hpp" #include "ovl_patches.hpp"
#include "librecomp/game.hpp" #include "librecomp/game.hpp"
#ifdef HAS_MM_SHADER_CACHE
#include "mm_shader_cache.h"
#endif
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
@ -321,12 +325,18 @@ RspUcodeFunc* get_rsp_microcode(const OSTask* task) {
extern "C" void recomp_entrypoint(uint8_t * rdram, recomp_context * ctx); extern "C" void recomp_entrypoint(uint8_t * rdram, recomp_context * ctx);
gpr get_entrypoint_address(); gpr get_entrypoint_address();
// TODO DO NOT MERGE THIS BRANCH WITHOUT REENABLING THE SHADER CACHE
#undef HAS_MM_SHADER_CACHE
// array of supported GameEntry objects // array of supported GameEntry objects
std::vector<recomp::GameEntry> supported_games = { std::vector<recomp::GameEntry> supported_games = {
{ {
.rom_hash = 0xEF18B4A9E2386169ULL, .rom_hash = 0xEF18B4A9E2386169ULL,
.internal_name = "ZELDA MAJORA'S MASK", .internal_name = "ZELDA MAJORA'S MASK",
.game_id = u8"mm.n64.us.1.0", .game_id = u8"mm.n64.us.1.0",
#ifdef HAS_MM_SHADER_CACHE
.cache_data = {mm_shader_cache_bytes, sizeof(mm_shader_cache_bytes)},
#endif
.is_enabled = true, .is_enabled = true,
.entrypoint_address = get_entrypoint_address(), .entrypoint_address = get_entrypoint_address(),
.entrypoint = recomp_entrypoint, .entrypoint = recomp_entrypoint,