From b817f2190a8111527f97fe7dfb6a4b20856cc6ce Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 4 Jul 2018 15:50:23 -0400 Subject: [PATCH] P4 to Git Change 1576209 by vsytchen@vsytchen-win10 on 2018/07/04 15:37:58 SWDEV-79445 - OCL generic changes and code clean-up 1. Purge redundant AllocMapTarget function ReviewBoardURL = http://ocltc.amd.com/reviews/r/15346/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_memobj.cpp#84 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#28 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#223 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#309 edit [ROCm/clr commit: 6e589b7de687524831333417b0b7413dc8aa3ea7] --- projects/clr/rocclr/runtime/device/device.cpp | 15 --------------- projects/clr/rocclr/runtime/device/device.hpp | 10 ---------- 2 files changed, 25 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/device.cpp b/projects/clr/rocclr/runtime/device/device.cpp index d880f07b17..a40cd8c94d 100644 --- a/projects/clr/rocclr/runtime/device/device.cpp +++ b/projects/clr/rocclr/runtime/device/device.cpp @@ -399,21 +399,6 @@ char* Device::getExtensionString() { return result; } -void* Device::allocMapTarget(amd::Memory& mem, const amd::Coord3D& origin, - const amd::Coord3D& region, uint mapFlags, size_t* rowPitch, - size_t* slicePitch) { - // Translate memory references - device::Memory* devMem = mem.getDeviceMemory(*this); - if (devMem == NULL) { - LogError("allocMapTarget failed. Can't allocate video memory"); - return NULL; - } - - // Pass request over to memory - return devMem->allocMapTarget(origin, region, mapFlags, rowPitch, slicePitch); -} - - #if defined(WITH_LIGHTNING_COMPILER) CacheCompilation::CacheCompilation(std::string targetStr, std::string postfix, bool enableCache, bool resetCache) diff --git a/projects/clr/rocclr/runtime/device/device.hpp b/projects/clr/rocclr/runtime/device/device.hpp index 757ade8224..3c1c8813b4 100644 --- a/projects/clr/rocclr/runtime/device/device.hpp +++ b/projects/clr/rocclr/runtime/device/device.hpp @@ -1513,16 +1513,6 @@ class Device : public RuntimeObject { //! resolves GL depth/msaa buffer virtual bool resolveGLMemory(device::Memory*) const { return true; } - //! Gets a pointer to a region of host-visible memory for use as the target - //! of an indirect map for a given memory object - virtual void* allocMapTarget(amd::Memory& mem, //!< Abstraction layer memory object - const amd::Coord3D& origin, //!< The map location in memory - const amd::Coord3D& region, //!< The map region in memory - uint mapFlags, //!< Map flags - size_t* rowPitch = NULL, //!< Row pitch for the mapped memory - size_t* slicePitch = NULL //!< Slice for the mapped memory - ); - //! Gets free memory on a GPU device virtual bool globalFreeMemory(size_t* freeMemory //!< Free memory information on a GPU device ) const = 0;