only setup the OpenCL device, not the OpenCL platform

Very few samples need the OpenCL platform, and when they do, they
can query it from the device.

Author: bashbaug

include/util.hpp

@@ -124,8 +124,7 @@ static bool checkDeviceIndex(
     return true;
 }
 
-static bool setupPlatformAndDevice(
-    cl::Platform& platform,
+static bool setupDevice(
     cl::Device& device,
     int platformIndex,
     int deviceIndex,
@@ -138,7 +137,7 @@ static bool setupPlatformAndDevice(
         return false;
     }
 
-    platform = std::move(platforms[platformIndex]);
+    const cl::Platform& platform = platforms[platformIndex];
     printf("Running on platform: %s\n",
         platform.getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/01_copybuffer/main.cpp

@@ -40,9 +40,8 @@ int main(int argc, char** argv)
         }
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }
 

samples/02_copybufferkernel/main.cpp

@@ -48,9 +48,8 @@ int main(int argc, char** argv)
         }
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }
 

samples/03_mandelbrot/main.cpp

@@ -83,9 +83,8 @@ int main(int argc, char** argv)
         }
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }
 

samples/04_julia/main.cpp

@@ -103,9 +103,8 @@ int main(int argc, char** argv)
         }
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }
 

samples/04_sobel/main.cpp

@@ -150,9 +150,8 @@ int main(int argc, char** argv)
         }
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }
 

samples/05_kernelfromfile/main.cpp

@@ -50,9 +50,8 @@ int main(int argc, char** argv)
         }
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }
 

samples/05_spirvkernelfromfile/main.cpp

@@ -132,9 +132,8 @@ int main(int argc, char** argv)
         }
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }
 

samples/06_ndrangekernelfromfile/main.cpp

@@ -65,9 +65,8 @@ int main(int argc, char** argv)
         }
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }
 

samples/10_queueexperiments/main.cpp

@@ -412,9 +412,8 @@ int main(int argc, char** argv)
         numKernels = maxKernels;
     }
 
-    cl::Platform platform;
     cl::Device device;
-    if (!setupPlatformAndDevice(platform, device, platformIndex, deviceIndex, verbose)) {
+    if (!setupDevice(device, platformIndex, deviceIndex, verbose)) {
         return -1;
     }