Skip to content

Commit b3249c2

Browse files
Make MemoryManager methods pure virtual
Related-To: NEO-4829 Change-Id: I97d0ef07bd26dac9869e61b5ff22064ea08596a8 Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
1 parent 913cfcf commit b3249c2

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

shared/source/memory_manager/memory_manager.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ class MemoryManager {
167167
virtual void releaseReservedCpuAddressRange(void *reserved, size_t size, uint32_t rootDeviceIndex){};
168168
void *getReservedMemory(size_t size, size_t alignment);
169169
GfxPartition *getGfxPartition(uint32_t rootDeviceIndex) { return gfxPartitions.at(rootDeviceIndex).get(); }
170-
virtual AddressRange reserveGpuAddress(size_t size, uint32_t rootDeviceIndex) { return AddressRange{0, 0}; };
171-
virtual void freeGpuAddress(AddressRange addressRange, uint32_t rootDeviceIndex) { return; };
170+
virtual AddressRange reserveGpuAddress(size_t size, uint32_t rootDeviceIndex) = 0;
171+
virtual void freeGpuAddress(AddressRange addressRange, uint32_t rootDeviceIndex) = 0;
172172
static HeapIndex selectInternalHeap(bool useLocalMemory) { return useLocalMemory ? HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY : HeapIndex::HEAP_INTERNAL; }
173173
static HeapIndex selectExternalHeap(bool useLocalMemory) { return useLocalMemory ? HeapIndex::HEAP_EXTERNAL_DEVICE_MEMORY : HeapIndex::HEAP_EXTERNAL; }
174174

@@ -197,7 +197,7 @@ class MemoryManager {
197197
virtual GraphicsAllocation *allocateGraphicsMemory64kb(const AllocationData &allocationData) = 0;
198198
virtual GraphicsAllocation *allocate32BitGraphicsMemoryImpl(const AllocationData &allocationData, bool useLocalMemory) = 0;
199199
virtual GraphicsAllocation *allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) = 0;
200-
virtual GraphicsAllocation *allocateGraphicsMemoryWithGpuVa(const AllocationData &allocationData) { return nullptr; }
200+
virtual GraphicsAllocation *allocateGraphicsMemoryWithGpuVa(const AllocationData &allocationData) = 0;
201201

202202
GraphicsAllocation *allocateGraphicsMemoryForImageFromHostPtr(const AllocationData &allocationData);
203203
MOCKABLE_VIRTUAL GraphicsAllocation *allocateGraphicsMemoryForImage(const AllocationData &allocationData);

shared/source/os_interface/windows/wddm_memory_manager.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ class WddmMemoryManager : public MemoryManager {
6161
void releaseReservedCpuAddressRange(void *reserved, size_t size, uint32_t rootDeviceIndex) override;
6262
bool isCpuCopyRequired(const void *ptr) override;
6363

64+
AddressRange reserveGpuAddress(size_t size, uint32_t rootDeviceIndex) override { return AddressRange{0, 0}; };
65+
void freeGpuAddress(AddressRange addressRange, uint32_t rootDeviceIndex) override{};
66+
6467
protected:
6568
GraphicsAllocation *createGraphicsAllocation(OsHandleStorage &handleStorage, const AllocationData &allocationData) override;
6669
GraphicsAllocation *allocateGraphicsMemoryForNonSvmHostPtr(const AllocationData &allocationData) override;
@@ -69,6 +72,7 @@ class WddmMemoryManager : public MemoryManager {
6972
GraphicsAllocation *allocateGraphicsMemory64kb(const AllocationData &allocationData) override;
7073
GraphicsAllocation *allocateShareableMemory(const AllocationData &allocationData) override;
7174
GraphicsAllocation *allocateGraphicsMemoryForImageImpl(const AllocationData &allocationData, std::unique_ptr<Gmm> gmm) override;
75+
GraphicsAllocation *allocateGraphicsMemoryWithGpuVa(const AllocationData &allocationData) override { return nullptr; }
7276

7377
void *lockResourceImpl(GraphicsAllocation &graphicsAllocation) override;
7478
void unlockResourceImpl(GraphicsAllocation &graphicsAllocation) override;

0 commit comments

Comments
 (0)