P4 to Git Change 1364611 by asalmanp@asalmanp-opencl-stg on 2017/01/20 19:12:14

SWDEV-111478 - [Vega] Clinfo doesn't report the CPU as a CL device.

	amdocl12cl64.dll is not loaded in Windows 10 (RS1) because the driverstore path wasn't searched to load for this module. Added the path to fix this issue.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/12211/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#563 edit
... //depot/stg/opencl/drivers/opencl/runtime/os/os.cpp#6 edit


[ROCm/clr commit: 8618ed31ca]

projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp

@@ -183,7 +183,6 @@ NullDevice::create(CALtarget target)
     if (NULL == compiler_) {
 #if !defined(ATI_OS_LINUX)
         char CompilerLibrary[220] = "";
-        strcpy_s(CompilerLibrary, calAttr.driverStore);
         strcat_s(CompilerLibrary, "amdocl12cl" LP64_SWITCH("", "64") ".dll");
 #endif
         const char *library = getenv("COMPILER_LIBRARY");
@@ -969,7 +968,6 @@ Device::create(CALuint ordinal, CALuint numOfDevices)
     if (NULL == compiler_) {
 #if !defined(ATI_OS_LINUX)
         char CompilerLibrary[220] = "";
-        strcpy_s(CompilerLibrary, getAttribs().driverStore);
         strcat_s(CompilerLibrary, "amdocl12cl" LP64_SWITCH("", "64") ".dll");
 #endif