Apply Clang formatting to MaterialXGenMsl

This changelist applies Clang formatting to the C++ source in MaterialXGenMsl, providing improvements in coding style consistency.
autodesk-forks · Mar 22, 2023 · e16235e · e16235e
1 parent 8efcfc2
commit e16235e
Show file tree

Hide file tree

Showing 33 changed files with 370 additions and 407 deletions.
diff --git a/source/MaterialXGenMsl/MslResourceBindingContext.cpp b/source/MaterialXGenMsl/MslResourceBindingContext.cpp
@@ -14,7 +14,8 @@ MslResourceBindingContext::MslResourceBindingContext(
     size_t uniformBindingLocation, size_t samplerBindingLocation) :
     _hwInitUniformBindLocation(uniformBindingLocation),
     _hwInitSamplerBindLocation(samplerBindingLocation)
-{}
+{
+}
 
 void MslResourceBindingContext::initialize()
 {
@@ -64,26 +65,25 @@ void MslResourceBindingContext::emitResourceBindings(GenContext& context, const
     generator.emitLineBreak(stage);
 }
 
-void MslResourceBindingContext::emitStructuredResourceBindings(GenContext& context, const VariableBlock& uniforms, 
-                                                                ShaderStage& stage, const std::string& structInstanceName,
-                                                                const std::string& arraySuffix)
+void MslResourceBindingContext::emitStructuredResourceBindings(GenContext& context, const VariableBlock& uniforms,
+                                                               ShaderStage& stage, const std::string& structInstanceName,
+                                                               const std::string& arraySuffix)
 {
     ShaderGenerator& generator = context.getShaderGenerator();
 
     const size_t baseAlignment = 16;
     // Values are adjusted based on
     // https://developer.apple.com/metal/Metal-Shading-Language-Specification.pdf
-    std::unordered_map<const TypeDesc*, size_t> alignmentMap({
-        { Type::FLOAT, baseAlignment / 4 },
-        { Type::INTEGER, baseAlignment / 4 },
-        { Type::BOOLEAN, baseAlignment / 4 },
-        { Type::COLOR3, baseAlignment },
-        { Type::COLOR4, baseAlignment },
-        { Type::VECTOR2, baseAlignment / 2 },
-        { Type::VECTOR3, baseAlignment },
-        { Type::VECTOR4, baseAlignment },
-        { Type::MATRIX33, baseAlignment * 4 },
-        { Type::MATRIX44, baseAlignment * 4 } });
+    std::unordered_map<const TypeDesc*, size_t> alignmentMap({ { Type::FLOAT, baseAlignment / 4 },
+                                                               { Type::INTEGER, baseAlignment / 4 },
+                                                               { Type::BOOLEAN, baseAlignment / 4 },
+                                                               { Type::COLOR3, baseAlignment },
+                                                               { Type::COLOR4, baseAlignment },
+                                                               { Type::VECTOR2, baseAlignment / 2 },
+                                                               { Type::VECTOR3, baseAlignment },
+                                                               { Type::VECTOR4, baseAlignment },
+                                                               { Type::MATRIX33, baseAlignment * 4 },
+                                                               { Type::MATRIX44, baseAlignment * 4 } });
 
     // Get struct alignment and size
     // alignment, uniform member index
@@ -110,9 +110,10 @@ void MslResourceBindingContext::emitStructuredResourceBindings(GenContext& conte
 
     // Sort order from largest to smallest
     std::sort(memberOrder.begin(), memberOrder.end(),
-        [](const std::pair<size_t, size_t>& a, const std::pair<size_t, size_t>& b) {
-            return a.first > b.first;
-        });
+              [](const std::pair<size_t, size_t>& a, const std::pair<size_t, size_t>& b)
+    {
+        return a.first > b.first;
+    });
 
     // Emit the struct
     generator.emitLine("struct " + uniforms.getName(), stage, false);
@@ -135,12 +136,11 @@ void MslResourceBindingContext::emitStructuredResourceBindings(GenContext& conte
     }
     generator.emitScopeEnd(stage, true);
 
-
     // Emit binding information
     generator.emitLineBreak(stage);
     generator.emitLine("struct " + uniforms.getName() + "_" +
-        stage.getName(),
-    stage, false);
+                           stage.getName(),
+                       stage, false);
     generator.emitScopeBegin(stage);
     generator.emitLine(uniforms.getName() + " " + structInstanceName + arraySuffix, stage);
     generator.emitScopeEnd(stage, true);

diff --git a/source/MaterialXGenMsl/MslResourceBindingContext.h b/source/MaterialXGenMsl/MslResourceBindingContext.h
@@ -26,7 +26,7 @@ class MX_GENMSL_API MslResourceBindingContext : public HwResourceBindingContext
     MslResourceBindingContext(size_t uniformBindingLocation, size_t samplerBindingLocation);
 
     static MslResourceBindingContextPtr create(
-        size_t uniformBindingLocation=0, size_t samplerBindingLocation=0)
+        size_t uniformBindingLocation = 0, size_t samplerBindingLocation = 0)
     {
         return std::make_shared<MslResourceBindingContext>(
             uniformBindingLocation, samplerBindingLocation);