P4 to Git Change 1195141 by gandryey@gera-dev-w7 on 2015/09/28 15:09:34

SWDEV-77522 - Remove direct references to the Resource object
	- In non-VM mode Resource was used as a memory object outside of SW heap

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.cpp#119 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.hpp#39 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuconstbuf.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuconstbuf.hpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#528 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#153 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#298 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#117 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.hpp#49 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprintf.cpp#38 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprintf.hpp#14 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#208 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#60 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#228 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.hpp#84 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#383 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#135 edit


[ROCm/clr commit: 4b23814a4d]
This commit is contained in:
foreman
2015-09-28 17:41:36 -04:00
parent c0d10e3b4a
commit 3db2d0ead4
16 changed files with 95 additions and 94 deletions
@@ -37,9 +37,9 @@ DmaBlitManager::gpuMem(device::Memory& mem) const
bool
DmaBlitManager::readMemoryStaged(
Resource& srcMemory,
Memory& srcMemory,
void* dstHost,
Resource** xferBuf,
Memory** xferBuf,
size_t origin,
size_t& offset,
size_t& totalSize,
@@ -196,9 +196,9 @@ DmaBlitManager::readBuffer(
}
if (0 != srcSize) {
Resource& xferBuf0 = dev().xferRead().acquire();
Resource& xferBuf1 = dev().xferRead().acquire();
Resource* xferBuf[2] = { &xferBuf0, &xferBuf1 };
Memory& xferBuf0 = dev().xferRead().acquire();
Memory& xferBuf1 = dev().xferRead().acquire();
Memory* xferBuf[2] = { &xferBuf0, &xferBuf1 };
// Read memory using a staged resource
if (!readMemoryStaged(gpuMem(srcMemory), dstHost, xferBuf, origin[0],
@@ -231,7 +231,7 @@ DmaBlitManager::readBufferRect(
srcMemory, dstHost, bufRect, hostRect, size, entire);
}
else {
Resource& xferBuf = dev().xferRead().acquire();
Memory& xferBuf = dev().xferRead().acquire();
amd::Coord3D dst(0, 0, 0);
size_t tmpSize = 0;
@@ -304,8 +304,8 @@ DmaBlitManager::readImage(
bool
DmaBlitManager::writeMemoryStaged(
const void* srcHost,
Resource& dstMemory,
Resource& xferBuf,
Memory& dstMemory,
Memory& xferBuf,
size_t origin,
size_t& offset,
size_t& totalSize,
@@ -433,7 +433,7 @@ DmaBlitManager::writeBuffer(
}
if (dstSize != 0) {
Resource& xferBuf = dev().xferWrite().acquire();
Memory& xferBuf = dev().xferWrite().acquire();
// Write memory using a staged resource
if (!writeMemoryStaged(srcHost, gpuMem(dstMemory), xferBuf, origin[0],
@@ -466,7 +466,7 @@ DmaBlitManager::writeBufferRect(
srcHost, dstMemory, hostRect, bufRect, size, entire);
}
else {
Resource& xferBuf = dev().xferWrite().acquire();
Memory& xferBuf = dev().xferWrite().acquire();
amd::Coord3D src(0, 0, 0);
size_t tmpSize = 0;