P4 to Git Change 1264764 by wchau@wchau_WIN_OCL_HSA on 2016/05/03 16:46:02

SWDEV-93075 - [OCL] Access violation in clCreateContext() in amdocl.dll when DX9 and DX11 devices are used.  Add support for multiple external devices for context creation to make sure the devices are initialized with proper type.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d10.cpp#12 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d11.cpp#19 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d9.cpp#29 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.hpp#95 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#274 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#547 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#160 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.cpp#128 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.cpp#62 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.hpp#30 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#41 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/context.hpp#25 edit

rocclr/runtime/device/gpu/gpumemory.cpp

@@ -268,6 +268,7 @@ Memory::createInterop(InteropType type)
     assert((interop != NULL) && "An invalid interop object is impossible!");
 
     amd::GLObject*  glObject = interop->asGLObject();
+
 #ifdef _WIN32
     amd::D3D10Object*   d3d10Object = interop->asD3D10Object();
     amd::D3D11Object*   d3d11Object = interop->asD3D11Object();
@@ -442,14 +443,15 @@ Memory::createInterop(InteropType type)
             return false;
             break;
         }
+
+        oglRes.glPlatformContext_ = owner()->getContext().info().hCtx_;
+        oglRes.glDeviceContext_ = owner()->getContext().info().hDev_[amd::Context::DeviceFlagIdx::GLDeviceKhrIdx];
+        // We dont pass any flags here for the GL Resource.
+        oglRes.flags_ = 0;
     }
     else {
         return false;
     }
-    oglRes.glPlatformContext_ = owner()->getContext().info().hCtx_;
-    oglRes.glDeviceContext_ = owner()->getContext().info().hDev_;
-    // We dont pass any flags here for the GL Resource.
-    oglRes.flags_ = 0;
 
     // Get the interop settings
     if (type == InteropDirectAccess) {