Fix several merge conflicts and auto-formatting issues

Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderReloadNotificationBus.h

@@ -53,7 +53,8 @@ namespace AZ
             virtual void OnShaderReinitialized(const Shader& shader) { AZ_UNUSED(shader); }
 
             //! Called when a particular shader variant is reinitialized.
-            virtual void OnShaderVariantReinitialized(const ShaderVariant& shaderVariant) { AZ_UNUSED(shaderVariant); }        };
+            virtual void OnShaderVariantReinitialized(const ShaderVariant& shaderVariant) { AZ_UNUSED(shaderVariant); }
+        };
 
         typedef EBus<ShaderReloadNotifications> ShaderReloadNotificationBus;
 

Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Shader/ShaderVariant.h

@@ -59,7 +59,7 @@ namespace AZ
             // Called by Shader. Initializes runtime data from asset data. Returns whether the call succeeded.
             bool Init(
                 const Data::Asset<ShaderAsset>& shaderAsset,
-                const Data::Asset<ShaderVariantAsset>& shaderVariantAsset);
+                const Data::Asset<ShaderVariantAsset>& shaderVariantAsset,
                 SupervariantIndex supervariantIndex);
 
             // AssetBus overrides...
@@ -77,6 +77,7 @@ namespace AZ
             Data::Asset<ShaderVariantAsset> m_shaderVariantAsset;
 
             const RHI::RenderStates* m_renderStates = nullptr; // Cached from ShaderAsset.
+            SupervariantIndex m_supervariantIndex;
         };
     }
 }