From 033df9926683c316614e0e3da03b30e1ec992de4 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sat, 23 Nov 2019 17:02:30 -0800
Subject: Updated clang-format workaround for brace-on-the-same line in lambdas

---
 Graphics/GLSLTools/src/SPIRVShaderResources.cpp | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'Graphics/GLSLTools')

diff --git a/Graphics/GLSLTools/src/SPIRVShaderResources.cpp b/Graphics/GLSLTools/src/SPIRVShaderResources.cpp
index c4f0cf34..6ba194a8 100644
--- a/Graphics/GLSLTools/src/SPIRVShaderResources.cpp
+++ b/Graphics/GLSLTools/src/SPIRVShaderResources.cpp
@@ -612,15 +612,15 @@ std::string SPIRVShaderResources::DumpResources()
     };
 
     ProcessResources(
-        [&](const SPIRVShaderResourceAttribs& UB, Uint32) // clang-format off
-        { // clang-format on
+        [&](const SPIRVShaderResourceAttribs& UB, Uint32) //
+        {
             VERIFY(UB.Type == SPIRVShaderResourceAttribs::ResourceType::UniformBuffer, "Unexpected resource type");
             ss << std::endl
                << std::setw(3) << ResNum << " Uniform Buffer   ";
             DumpResource(UB);
         },
-        [&](const SPIRVShaderResourceAttribs& SB, Uint32) // clang-format off
-        { // clang-format on
+        [&](const SPIRVShaderResourceAttribs& SB, Uint32) //
+        {
             VERIFY(SB.Type == SPIRVShaderResourceAttribs::ResourceType::ROStorageBuffer ||
                        SB.Type == SPIRVShaderResourceAttribs::ResourceType::RWStorageBuffer,
                    "Unexpected resource type");
@@ -629,8 +629,8 @@ std::string SPIRVShaderResources::DumpResources()
                << (SB.Type == SPIRVShaderResourceAttribs::ResourceType::ROStorageBuffer ? " RO Storage Buffer" : " RW Storage Buffer");
             DumpResource(SB);
         },
-        [&](const SPIRVShaderResourceAttribs& Img, Uint32) // clang-format off
-        { // clang-format on
+        [&](const SPIRVShaderResourceAttribs& Img, Uint32) //
+        {
             if (Img.Type == SPIRVShaderResourceAttribs::ResourceType::StorageImage)
             {
                 ss << std::endl
@@ -645,8 +645,8 @@ std::string SPIRVShaderResources::DumpResources()
                 UNEXPECTED("Unexpected resource type");
             DumpResource(Img);
         },
-        [&](const SPIRVShaderResourceAttribs& SmplImg, Uint32) // clang-format off
-        { // clang-format on
+        [&](const SPIRVShaderResourceAttribs& SmplImg, Uint32) //
+        {
             if (SmplImg.Type == SPIRVShaderResourceAttribs::ResourceType::SampledImage)
             {
                 ss << std::endl
@@ -661,28 +661,28 @@ std::string SPIRVShaderResources::DumpResources()
                 UNEXPECTED("Unexpected resource type");
             DumpResource(SmplImg);
         },
-        [&](const SPIRVShaderResourceAttribs& AC, Uint32) // clang-format off
-        { // clang-format on
+        [&](const SPIRVShaderResourceAttribs& AC, Uint32) //
+        {
             VERIFY(AC.Type == SPIRVShaderResourceAttribs::ResourceType::AtomicCounter, "Unexpected resource type");
             ss << std::endl
                << std::setw(3) << ResNum << " Atomic Cntr      ";
             DumpResource(AC);
         },
-        [&](const SPIRVShaderResourceAttribs& SepSmpl, Uint32) // clang-format off
-        { // clang-format on
+        [&](const SPIRVShaderResourceAttribs& SepSmpl, Uint32) //
+        {
             VERIFY(SepSmpl.Type == SPIRVShaderResourceAttribs::ResourceType::SeparateSampler, "Unexpected resource type");
             ss << std::endl
                << std::setw(3) << ResNum << " Separate Smpl    ";
             DumpResource(SepSmpl);
         },
-        [&](const SPIRVShaderResourceAttribs& SepImg, Uint32) // clang-format off
-        { // clang-format on
+        [&](const SPIRVShaderResourceAttribs& SepImg, Uint32) //
+        {
             VERIFY(SepImg.Type == SPIRVShaderResourceAttribs::ResourceType::SeparateImage, "Unexpected resource type");
             ss << std::endl
                << std::setw(3) << ResNum << " Separate Img     ";
             DumpResource(SepImg);
-        } // clang-format off
-    ); // clang-format on
+        } //
+    );
     VERIFY_EXPR(ResNum == GetTotalResources());
 
     return ss.str();
-- 
cgit v1.2.3