Simplify code by removing AllocationOrigin.

Change-Id: Ie73cefc1ae1ee846fb9a5ef1054af01cd1867a4d
This commit is contained in:
Piotr Fusik
2019-02-21 16:29:05 +01:00
parent 90e970cee6
commit 4ec5be0c99
16 changed files with 63 additions and 104 deletions

View File

@@ -88,14 +88,10 @@ class TestedDrmMemoryManager : public DrmMemoryManager {
Allocator32bit *getDrmInternal32BitAllocator() const { return internal32bitAllocator.get(); }
AllocatorLimitedRange *getDrmLimitedRangeAllocator() const { return limitedGpuAddressRangeAllocator.get(); }
DrmAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, AllocationOrigin allocationOrigin) {
DrmAllocation *allocate32BitGraphicsMemory(size_t size, const void *ptr, GraphicsAllocation::AllocationType allocationType) {
bool allocateMemory = ptr == nullptr;
AllocationData allocationData;
if (allocationOrigin == AllocationOrigin::EXTERNAL_ALLOCATION) {
getAllocationData(allocationData, MockAllocationProperties::getPropertiesFor32BitExternalAllocation(size, allocateMemory), {}, ptr);
} else {
getAllocationData(allocationData, MockAllocationProperties::getPropertiesFor32BitInternalAllocation(size, allocateMemory), {}, ptr);
}
getAllocationData(allocationData, MockAllocationProperties(allocateMemory, size, allocationType), {}, ptr);
return allocate32BitGraphicsMemoryImpl(allocationData);
}
};