Selaa lähdekoodia

[SMC] (tiny) cosmetic (#17279)

* [smc] Historical change allowed this simplification but wasn't spotted.

Signed-off-by: Vivien Oddou <[email protected]>

* [SMC PR] comment for clarity and emplace_back for lightweight inner string ownership move. Also good demonstration of pattern, in case future maintenance in the code gets inspired by this bit.

Signed-off-by: Vivien Oddou <[email protected]>

---------

Signed-off-by: Vivien Oddou <[email protected]>
siliconvoodoo 1 vuosi sitten
vanhempi
commit
e92fd03ac3

+ 7 - 16
Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Document/ShaderManagementConsoleDocument.cpp

@@ -67,22 +67,13 @@ namespace ShaderManagementConsole
 
     AZ::u32 ShaderManagementConsoleDocument::AddOneVariantRow()
     {
-        auto shaderAssetResult =
-            AZ::RPI::AssetUtils::LoadAsset<AZ::RPI::ShaderAsset>(m_absolutePath,
-                                                                 m_shaderVariantListSourceData.m_shaderFilePath);
-        if (shaderAssetResult)
-
-        {
-            AZ::Data::Asset<AZ::RPI::ShaderAsset> shaderAsset = shaderAssetResult.GetValue();
-            AZStd::vector<AZ::RPI::ShaderOptionDescriptor> options = shaderAsset->GetShaderOptionGroupLayout()->GetShaderOptions();
-            AZ::RPI::ShaderVariantListSourceData::VariantInfo variantInfo;
-            variantInfo.m_stableId = m_shaderVariantListSourceData.m_shaderVariants.empty()
-                ? 1  // stable ID start at 1, since 0 is reserved as explained in ShaderVariantTreeAssetCreator
-                : m_shaderVariantListSourceData.m_shaderVariants.back().m_stableId + 1;
-            m_shaderVariantListSourceData.m_shaderVariants.push_back(variantInfo);
-            return variantInfo.m_stableId;
-        }
-        return {};
+        AZ::RPI::ShaderVariantListSourceData::VariantInfo variantInfo;
+        AZ::u32 nextStableId = m_shaderVariantListSourceData.m_shaderVariants.empty()
+            ? 1  // stable ID start at 1, since 0 is reserved as explained in ShaderVariantTreeAssetCreator
+            : m_shaderVariantListSourceData.m_shaderVariants.back().m_stableId + 1;  // by invariant (no row shuffles), last stableId is highest in vector
+        variantInfo.m_stableId = nextStableId;
+        m_shaderVariantListSourceData.m_shaderVariants.emplace_back(AZStd::move(variantInfo));
+        return nextStableId;
     }
 
     // Utility used in sparse-variant-set functions