Adjust clang format to the new versions, revert broken macro layout (#714)

projects/clr/opencl/amdocl/cl_gl.cpp

@@ -885,9 +885,8 @@ RUNTIME_ENTRY(cl_int, clGetGLContextInfoKHR,
 
         for (cl_uint i = 0; i < num_gpu_devices; ++i) {
           cl_device_id device = gpu_devices[i];
-          if (is_valid(device) &&
-              as_amd(device)->bindExternalDevice(info.flags_, info.hDev_, info.hCtx_,
-                                                 VALIDATE_ONLY)) {
+          if (is_valid(device) && as_amd(device)->bindExternalDevice(info.flags_, info.hDev_,
+                                                                     info.hCtx_, VALIDATE_ONLY)) {
             return amd::clGetInfo(device, param_value_size, param_value, param_value_size_ret);
           }
         }
@@ -912,9 +911,8 @@ RUNTIME_ENTRY(cl_int, clGetGLContextInfoKHR,
 
       for (cl_uint i = 0; i < total_devices; ++i) {
         cl_device_id device = devices[i];
-        if (is_valid(device) &&
-            as_amd(device)->bindExternalDevice(info.flags_, info.hDev_, info.hCtx_,
-                                               VALIDATE_ONLY)) {
+        if (is_valid(device) && as_amd(device)->bindExternalDevice(info.flags_, info.hDev_,
+                                                                   info.hCtx_, VALIDATE_ONLY)) {
           compatible_devices.push_back(as_amd(device));
         }
       }