mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-05-23 23:02:42 -05:00
Merge pull request #14579 from Sintendo/dsp-rm-init-hax
DSPCore: Remove m_init_hax member
This commit is contained in:
commit
6ed8dec7ac
|
|
@ -429,8 +429,6 @@ bool DSPCore::Initialize(const DSPInitOptions& opts)
|
|||
if (!m_dsp.Initialize(opts))
|
||||
return false;
|
||||
|
||||
m_init_hax = false;
|
||||
|
||||
// Initialize JIT, if necessary
|
||||
if (opts.core_type == DSPInitOptions::CoreType::JIT64)
|
||||
m_dsp_jit = JIT::CreateDSPEmitter(*this);
|
||||
|
|
@ -602,7 +600,6 @@ bool DSPCore::IsJITCreated() const
|
|||
void DSPCore::DoState(PointerWrap& p)
|
||||
{
|
||||
m_dsp.DoState(p);
|
||||
p.Do(m_init_hax);
|
||||
|
||||
if (m_dsp_jit)
|
||||
m_dsp_jit->DoState(p);
|
||||
|
|
|
|||
|
|
@ -582,7 +582,6 @@ private:
|
|||
SDSP m_dsp;
|
||||
DSPBreakpoints m_dsp_breakpoints;
|
||||
State m_core_state = State::Stopped;
|
||||
bool m_init_hax = false;
|
||||
std::unique_ptr<Interpreter::Interpreter> m_dsp_interpreter;
|
||||
std::unique_ptr<JIT::DSPEmitter> m_dsp_jit;
|
||||
std::unique_ptr<DSPCaptureLogger> m_dsp_cap;
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ static u32 s_last_state_size = 0;
|
|||
// Shared locks are acquired for each state save task.
|
||||
// Tasks generally transition from: Calling thread -> CPU thread -> Compress/Write thread.
|
||||
// Holding an "exclusive" lock will:
|
||||
// 1. Ensure all previous save tasks have been completely written to the file systen.
|
||||
// 1. Ensure all previous save tasks have been completely written to the file system.
|
||||
// 2. Prevent new tasks from starting.
|
||||
static Common::TransferableSharedMutex s_state_saves_in_progress;
|
||||
|
||||
|
|
@ -95,7 +95,7 @@ struct CompressAndDumpStateArgs
|
|||
static Common::WorkQueueThreadSP<CompressAndDumpStateArgs> s_compress_and_dump_thread;
|
||||
|
||||
// Don't forget to increase this after doing changes on the savestate system
|
||||
constexpr u32 STATE_VERSION = 187; // Last changed in PR 14552
|
||||
constexpr u32 STATE_VERSION = 188; // Last changed in PR 14579
|
||||
|
||||
// Increase this if the StateExtendedHeader definition changes
|
||||
constexpr u32 EXTENDED_HEADER_VERSION = 1; // Last changed in PR 12217
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user