isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-20 22:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Add potentially unnecessary threading stuff"

Browse Source 
This reverts commit 0787b2ebf8.
This commit is contained in:
VoxelTek 2025-07-31 11:18:47 +10:00
parent 5ca0b4ce8d
commit e4ca44c915
2 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LEGO1/omni/include/mxthread.h
View File

@ -5,11 +5,7 @@
#include "mxsemaphore.h" #include "mxsemaphore.h"
#include "mxtypes.h" #include "mxtypes.h"
#ifdef PS2
#include <kernel.h>
#else
#include <SDL3/SDL_thread.h> #include <SDL3/SDL_thread.h>
#endif
class MxCore; class MxCore;
@ -45,13 +41,9 @@ class MxThread {
virtual ~MxThread(); virtual ~MxThread();
private: private:
#ifdef PS2
static int ThreadProc(void* p_thread);
int m_thread;
#else
static int SDLCALL ThreadProc(void* p_thread); static int SDLCALL ThreadProc(void* p_thread);
SDL_Thread* m_thread; SDL_Thread* m_thread;
#endif
MxBool m_running; // 0x0c MxBool m_running; // 0x0c
MxSemaphore m_semaphore; // 0x10 MxSemaphore m_semaphore; // 0x10

31
LEGO1/omni/src/system/mxthread.cpp
View File

@ -3,9 +3,6 @@
#include "decomp.h" #include "decomp.h"
#include <SDL3/SDL_timer.h> #include <SDL3/SDL_timer.h>
#ifdef PS2
#include <kernel.h>
#endif
DECOMP_SIZE_ASSERT(MxThread, 0x1c) DECOMP_SIZE_ASSERT(MxThread, 0x1c)
@ -13,11 +10,7 @@ DECOMP_SIZE_ASSERT(MxThread, 0x1c)
// FUNCTION: BETA10 0x10147540 // FUNCTION: BETA10 0x10147540
MxThread::MxThread() MxThread::MxThread()
{ {
#ifdef PS2
m_thread = 0;
#else
m_thread = NULL; m_thread = NULL;
#endif
m_running = TRUE; m_running = TRUE;
} }
@ -26,13 +19,7 @@ MxThread::MxThread()
MxThread::~MxThread() MxThread::~MxThread()
{ {
if (m_thread) { if (m_thread) {
#ifdef PS2
ReleaseWaitThread(m_thread);
DeleteThread(m_thread);
m_thread = 0;
#else
SDL_WaitThread(m_thread, NULL); SDL_WaitThread(m_thread, NULL);
#endif
} }
} }
@ -43,23 +30,6 @@ MxResult MxThread::Start(MxS32 p_stackSize, MxS32 p_flag)
MxResult result = FAILURE; MxResult result = FAILURE;
if (m_semaphore.Init(0, 1) != SUCCESS) { if (m_semaphore.Init(0, 1) != SUCCESS) {
#ifdef PS2
ee_thread_t thread;
thread.func = (void*)&(MxThread::ThreadProc);
thread .stack_size = p_stackSize * 4;
thread.initial_priority = 0x18;
int thid = CreateThread(&thread);
if (thid >= 0) {
MxThread* self = this;
int start = StartThread(thid, &self);
if (start >= 0) {
result = SUCCESS;
m_thread = thid; // store thread ID if needed
}
}
}
#else
goto done; goto done;
} }
@ -75,7 +45,6 @@ MxResult MxThread::Start(MxS32 p_stackSize, MxS32 p_flag)
SDL_DestroyProperties(props); SDL_DestroyProperties(props);
} }
#endif
result = SUCCESS; result = SUCCESS;