From 50fe1ffc19e50e281a4149e132dd0ead08f7b8b6 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 15 May 2017 19:42:30 -0400 Subject: [PATCH] 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: 34c374b28763040517bfb5c466d8f68062b2c057] --- projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp index f7a8bdedea..54f3608656 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_gl.cpp @@ -1468,7 +1468,7 @@ bool ImageGL::mapExtObjectInCQThread() { if (checkForGLError(context_()) != GL_NO_ERROR) { LogError("cannot map GL texture"); - free(pCpuMem); + delete[] pCpuMem; return false; }