Move setting external memory managers to mock layers.

Change-Id: I335fd35269da9093c9e744c2735215e8d561098c
This commit is contained in:
Mrozek, Michal
2018-07-20 09:01:58 +02:00
committed by sys_ocldev
parent 239ebf9eab
commit 366a12e3ce
7 changed files with 45 additions and 37 deletions

View File

@ -45,17 +45,15 @@ bool ExecutionEnvironment::initializeCommandStreamReceiver(const HardwareInfo *p
this->commandStreamReceiver.reset(commandStreamReceiver);
return true;
}
void ExecutionEnvironment::initializeMemoryManager(MemoryManager *externalMemoryManager, bool enable64KBpages) {
void ExecutionEnvironment::initializeMemoryManager(bool enable64KBpages) {
if (this->memoryManager) {
commandStreamReceiver->setMemoryManager(this->memoryManager.get());
return;
}
if (!externalMemoryManager) {
memoryManager.reset(commandStreamReceiver->createMemoryManager(enable64KBpages));
commandStreamReceiver->setMemoryManager(memoryManager.get());
} else {
commandStreamReceiver->setMemoryManager(externalMemoryManager);
}
memoryManager.reset(commandStreamReceiver->createMemoryManager(enable64KBpages));
commandStreamReceiver->setMemoryManager(memoryManager.get());
DEBUG_BREAK_IF(!this->memoryManager);
}

View File

@ -40,7 +40,7 @@ class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment>
~ExecutionEnvironment() override;
void initGmm(const HardwareInfo *hwInfo);
bool initializeCommandStreamReceiver(const HardwareInfo *pHwInfo);
void initializeMemoryManager(MemoryManager *externalMemoryManager, bool enable64KBpages);
void initializeMemoryManager(bool enable64KBpages);
std::unique_ptr<MemoryManager> memoryManager;
std::unique_ptr<CommandStreamReceiver> commandStreamReceiver;
};