Insert Braces around single line ifs. (#1077)

Add the `InsertBraces: true` flag for clang-format and re-run the
formatter. This forces brackets around all of the single line entries
which did not previously have them.

.clang-format

@@ -1,2 +1,4 @@
 # http://clang.llvm.org/docs/ClangFormatStyleOptions.html
 BasedOnStyle: Chromium
+
+InsertBraces: true

include/amber/amber.h

@@ -106,7 +106,7 @@ class Delegate {
                                  std::vector<char>* buffer) const = 0;
 
   /// Mechanism for gathering timing from 'TIME_EXECUTION'
-  virtual void ReportExecutionTiming(double){}
+  virtual void ReportExecutionTiming(double) {}
 };
 
 /// Stores configuration options for Amber.

samples/amber.cc

@@ -394,8 +394,9 @@ class SampleDelegate : public amber::Delegate {
 #endif  // AMBER_ENABLE_LODEPNG
     } else {
       auto data = ReadFile(path_ + file_name);
-      if (data.empty())
+      if (data.empty()) {
         return amber::Result("Failed to load buffer data " + file_name);
+      }
 
       for (auto d : data) {
         amber::Value v;
@@ -413,8 +414,9 @@ class SampleDelegate : public amber::Delegate {
   amber::Result LoadFile(const std::string file_name,
                          std::vector<char>* buffer) const override {
     *buffer = ReadFile(path_ + file_name);
-    if (buffer->empty())
+    if (buffer->empty()) {
       return amber::Result("Failed to load file " + file_name);
+    }
     return {};
   }
 
@@ -433,8 +435,9 @@ std::string disassemble(const std::string& env,
 
   spv_target_env target_env = SPV_ENV_UNIVERSAL_1_0;
   if (!env.empty()) {
-    if (!spvParseTargetEnv(env.c_str(), &target_env))
+    if (!spvParseTargetEnv(env.c_str(), &target_env)) {
       return "";
+    }
   }
 
   auto msg_consumer = [&spv_errors](spv_message_level_t level, const char*,
@@ -539,8 +542,9 @@ int main(int argc, const char** argv) {
       continue;
     }
 
-    if (options.fence_timeout > -1)
+    if (options.fence_timeout > -1) {
       recipe->SetFenceTimeout(static_cast<uint32_t>(options.fence_timeout));
+    }
 
     recipe->SetPipelineRuntimeLayerEnabled(
         options.enable_pipeline_runtime_layer);
@@ -550,15 +554,19 @@ int main(int argc, const char** argv) {
     recipe_data.back().recipe = std::move(recipe);
   }
 
-  if (options.parse_only)
+  if (options.parse_only) {
     return 0;
+  }
 
-  if (options.log_graphics_calls)
+  if (options.log_graphics_calls) {
     delegate.SetLogGraphicsCalls(true);
-  if (options.log_graphics_calls_time)
+  }
+  if (options.log_graphics_calls_time) {
     delegate.SetLogGraphicsCallsTime(true);
-  if (options.log_execute_calls)
+  }
+  if (options.log_execute_calls) {
     delegate.SetLogExecuteCalls(true);
+  }
 
   amber::Options amber_options;
   amber_options.engine = options.engine;
@@ -628,8 +636,9 @@ int main(int argc, const char** argv) {
   }
 
   // Use default frame buffer name when not specified.
-  while (options.image_filenames.size() > options.fb_names.size())
+  while (options.image_filenames.size() > options.fb_names.size()) {
     options.fb_names.push_back(kGeneratedColorBuffer);
+  }
 
   for (const auto& fb_name : options.fb_names) {
     amber::BufferInfo buffer_info;
@@ -773,8 +782,9 @@ int main(int argc, const char** argv) {
           for (size_t i = 0; i < values.size(); ++i) {
             buffer_file << " " << std::setfill('0') << std::setw(2) << std::hex
                         << values[i].AsUint32();
-            if (i % 16 == 15)
+            if (i % 16 == 15) {
               buffer_file << std::endl;
+            }
           }
           buffer_file << std::endl;
         }
@@ -787,8 +797,9 @@ int main(int argc, const char** argv) {
     if (!failures.empty()) {
       std::cout << "\nSummary of Failures:" << std::endl;
 
-      for (const auto& failure : failures)
+      for (const auto& failure : failures) {
         std::cout << "  " << failure << std::endl;
+      }
     }
 
     std::cout << "\nSummary: "

samples/android_helper.cc

@@ -54,8 +54,9 @@ extern "C" JNIEXPORT JNICALL int Java_com_google_amber_Amber_androidHelper(
 
   std::vector<const char*> argv;
 
-  for (const std::string& arg : argv_string)
+  for (const std::string& arg : argv_string) {
     argv.push_back(arg.c_str());
+  }
 
   return android_main(static_cast<int>(argv.size()), argv.data());
 }

samples/config_helper.cc

@@ -65,8 +65,9 @@ amber::Result ConfigHelper::CreateConfig(
 #endif  // AMBER_ENGINE_DAWN
   }
 
-  if (!impl_)
+  if (!impl_) {
     return amber::Result("Unable to create config helper");
+  }
 
   return impl_->CreateConfig(
       engine_major, engine_minor, selected_device, required_features,

samples/config_helper_dawn.cc

@@ -76,8 +76,9 @@ amber::Result ConfigHelperDawn::CreateConfig(
     }
   }
 
-  if (!dawn_device_)
+  if (!dawn_device_) {
     return amber::Result("could not find Vulkan or Metal backend for Dawn");
+  }
 
   backendProcs.deviceSetUncapturedErrorCallback(dawn_device_.Get(),
                                                 PrintDeviceError, nullptr);