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: 34c374b287]

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;
   }