P4 to Git Change 1175317 by gandryey@gera-dev-w7 on 2015/07/29 17:42:25

ECR #304775 - Remove obsolete functions

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#515 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#127 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#51 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceLinux.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDeviceWin.cpp#5 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/backend.cpp#13 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/backend.h#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/build/Makefile.backend#8 edit

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -1251,7 +1251,7 @@ Device::init()
    }
 #endif // _WIN32 & DEBUG
 
-    calInit();
+    gslInit();
 
 #if defined(_WIN32) && !defined(_WIN64)
     _controlfp_s(&ignored, old, _MCW_RC | _MCW_PC);
@@ -1259,7 +1259,7 @@ Device::init()
 
     // Get the total number of active devices
     // Count up all the devices in the system.
-    numDevices = calGetDeviceCount();
+    numDevices = gsAdaptor::enumerateAdaptors();
 
     CALuint ordinal = 0;
     const char* selectDeviceByName = NULL;
@@ -1295,7 +1295,7 @@ void
 Device::tearDown()
 {
     osExit();
-    calShutdown();
+    gslExit();
     aclCompilerFini(compiler_);
     if (hsaCompiler_ != NULL) {
         aclCompilerFini(hsaCompiler_);