Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -16,13 +16,13 @@ static const unsigned int NUM_SUBMIT_JOBS = 128;
|
||||
#define DMA_ALIGNMENT (128)
|
||||
#define JOBHEADER_SYMBOL(JobName) _binary_jqjob_##JobName##_jobbin2_jobheader
|
||||
|
||||
C4JSpursJobQueue* C4JSpursJobQueue::m_pMainJobQueue = nullptr;
|
||||
C4JSpursJobQueue* C4JSpursJobQueue::m_pMainJobQueue = NULL;
|
||||
|
||||
uint16_t C4JSpursJobQueue::Port::s_jobTagBitmask = 0;
|
||||
C4JSpursJobQueue::Port* C4JSpursJobQueue::Port::s_allocatedPorts[16] = {nullptr,nullptr,nullptr,nullptr,
|
||||
nullptr,nullptr,nullptr,nullptr,
|
||||
nullptr,nullptr,nullptr,nullptr,
|
||||
nullptr,nullptr,nullptr,nullptr };
|
||||
C4JSpursJobQueue::Port* C4JSpursJobQueue::Port::s_allocatedPorts[16] = {NULL,NULL,NULL,NULL,
|
||||
NULL,NULL,NULL,NULL,
|
||||
NULL,NULL,NULL,NULL,
|
||||
NULL,NULL,NULL,NULL };
|
||||
bool C4JSpursJobQueue::Port::s_initialised;
|
||||
CRITICAL_SECTION C4JSpursJobQueue::Port::s_lock;
|
||||
|
||||
@@ -43,7 +43,7 @@ C4JSpursJobQueue::C4JSpursJobQueue()
|
||||
|
||||
//E create jobQueue
|
||||
pJobQueue = (JobQueue<JOB_QUEUE_DEPTH>*)memalign(CELL_SPURS_JOBQUEUE_ALIGN, sizeof(JobQueue<JOB_QUEUE_DEPTH>));
|
||||
assert(pJobQueue != nullptr);
|
||||
assert(pJobQueue != NULL);
|
||||
|
||||
ret = JobQueue<JOB_QUEUE_DEPTH>::create( pJobQueue,
|
||||
spurs,
|
||||
@@ -168,7 +168,7 @@ int C4JSpursJobQueue::Port::getFreeJobTag()
|
||||
void C4JSpursJobQueue::Port::releaseJobTag( int tag )
|
||||
{
|
||||
s_jobTagBitmask &= ~(1<<tag);
|
||||
s_allocatedPorts[tag] = nullptr;
|
||||
s_allocatedPorts[tag] = NULL;
|
||||
}
|
||||
|
||||
void C4JSpursJobQueue::Port::destroyAll()
|
||||
|
||||
Reference in New Issue
Block a user