P4 to Git Change 1409878 by lmoriche@lmoriche_palamida on 2017/05/15 19:30:18

SWDEV-121585 - [OCL-LC-ROCm] Merge GitHub pull requests
	- Merged https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/pull/4

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_gl.cpp#55 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/v0_8/libUtils.h#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocbinary.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/os/os_win32.cpp#48 edit


[ROCm/clr commit: 0c526a2e0d]
This commit is contained in:
foreman
2017-05-15 19:42:30 -04:00
parent 1ecd94d1f4
commit 11e70960a2
5 changed files with 8 additions and 8 deletions
@@ -585,9 +585,8 @@ bool Buffer::create() {
if (nullptr != owner()->parent()) {
amd::Memory& parent = *owner()->parent();
// Sub-Buffer creation.
roc:
Memory* parentBuffer = static_cast<roc::Memory*>(parent.getDeviceMemory(dev_));
// Sub-Buffer creation.
roc::Memory* parentBuffer = static_cast<roc::Memory*>(parent.getDeviceMemory(dev_));
if (parentBuffer == nullptr) {
LogError("[OCL] Fail to allocate parent buffer");