Add MemObj offset to constructPropertiesForReadWriteBuffer()

Change-Id: I1b90eeb6eec1b5172fb07900351c24581e8b3b3c
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
Related-To: NEO-3020
This commit is contained in:
Dunajski, Bartosz
2019-09-17 13:59:33 +02:00
committed by sys_ocldev
parent 115070767c
commit 0398572c48
4 changed files with 34 additions and 26 deletions

View File

@@ -17,14 +17,16 @@
namespace NEO {
BlitProperties BlitProperties::constructPropertiesForReadWriteBuffer(BlitterConstants::BlitDirection blitDirection,
CommandStreamReceiver &commandStreamReceiver,
GraphicsAllocation *memObjAllocation, void *hostPtr, size_t hostPtrOffset,
bool blocking, size_t offset, uint64_t copySize) {
GraphicsAllocation *memObjAllocation, size_t memObjOffset,
void *hostPtr, size_t hostPtrOffset,
bool blocking, size_t copyOffset, uint64_t copySize) {
HostPtrSurface hostPtrSurface(hostPtr, static_cast<size_t>(copySize), true);
bool success = commandStreamReceiver.createAllocationForHostSurface(hostPtrSurface, false);
UNRECOVERABLE_IF(!success);
auto hostPtrAllocation = hostPtrSurface.getAllocation();
auto offset = copyOffset + memObjOffset;
if (BlitterConstants::BlitDirection::HostPtrToBuffer == blitDirection) {
return {nullptr, blitDirection, {}, AuxTranslationDirection::None, memObjAllocation, hostPtrAllocation, hostPtr, blocking, offset, hostPtrOffset, copySize};
} else {
@@ -38,12 +40,12 @@ BlitProperties BlitProperties::constructPropertiesForReadWriteBuffer(BlitterCons
bool blocking) {
if (BlitterConstants::BlitDirection::HostPtrToBuffer == blitDirection) {
return constructPropertiesForReadWriteBuffer(blitDirection, commandStreamReceiver, builtinOpParams.dstMemObj->getGraphicsAllocation(),
builtinOpParams.srcPtr, builtinOpParams.srcOffset.x, blocking, builtinOpParams.dstOffset.x,
builtinOpParams.size.x);
builtinOpParams.dstMemObj->getOffset(), builtinOpParams.srcPtr, builtinOpParams.srcOffset.x,
blocking, builtinOpParams.dstOffset.x, builtinOpParams.size.x);
} else {
return constructPropertiesForReadWriteBuffer(blitDirection, commandStreamReceiver, builtinOpParams.srcMemObj->getGraphicsAllocation(),
builtinOpParams.dstPtr, builtinOpParams.dstOffset.x, blocking, builtinOpParams.srcOffset.x,
builtinOpParams.size.x);
builtinOpParams.srcMemObj->getOffset(), builtinOpParams.dstPtr, builtinOpParams.dstOffset.x,
blocking, builtinOpParams.srcOffset.x, builtinOpParams.size.x);
}
}

View File

@@ -23,8 +23,9 @@ class TimestampPacketContainer;
struct BlitProperties {
static BlitProperties constructPropertiesForReadWriteBuffer(BlitterConstants::BlitDirection blitDirection,
CommandStreamReceiver &commandStreamReceiver,
GraphicsAllocation *memObjAllocation, void *hostPtr, size_t hostPtrOffset,
bool blocking, size_t offset, uint64_t copySize);
GraphicsAllocation *memObjAllocation, size_t memObjOFfset,
void *hostPtr, size_t hostPtrOffset,
bool blocking, size_t copyOffset, uint64_t copySize);
static BlitProperties constructPropertiesForReadWriteBuffer(BlitterConstants::BlitDirection blitDirection,
CommandStreamReceiver &commandStreamReceiver,