diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.cpp index 8e07794c33..3d0299667c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Archive/ArchiveComponent.cpp @@ -21,7 +21,7 @@ namespace AzToolsFramework { - constexpr const char s_traceName[] = "ArchiveComponent"; + [[maybe_unused]] constexpr const char s_traceName[] = "ArchiveComponent"; constexpr AZ::u32 s_compressionMethod = AZ::IO::INestedArchive::METHOD_DEFLATE; constexpr AZ::s32 s_compressionLevel = AZ::IO::INestedArchive::LEVEL_NORMAL; constexpr CompressionCodec::Codec s_compressionCodec = CompressionCodec::Codec::ZLIB; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp index 4f8f575a7b..896e40d929 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp @@ -927,7 +927,7 @@ namespace AzToolsFramework PrefabDomValue& instance = instanceIterator->value; AZ_Assert(instance.IsObject(), "Nested instance DOM provided is not a valid JSON object."); - PrefabDomValueReference sourceTemplateName = PrefabDomUtils::FindPrefabDomValue(instance, PrefabDomUtils::SourceName); + [[maybe_unused]] PrefabDomValueReference sourceTemplateName = PrefabDomUtils::FindPrefabDomValue(instance, PrefabDomUtils::SourceName); AZ_Assert(sourceTemplateName, "Couldn't find source template name in the DOM of the nested instance while creating a link."); AZ_Assert(sourceTemplateName->get() == sourceTemplate.GetFilePath().c_str(), "The name of the source template in the nested instance DOM does not match the name of the source template already loaded"); diff --git a/Gems/AtomTressFX/Code/Assets/HairAsset.h b/Gems/AtomTressFX/Code/Assets/HairAsset.h index 7075983e8f..b7dd94bda1 100644 --- a/Gems/AtomTressFX/Code/Assets/HairAsset.h +++ b/Gems/AtomTressFX/Code/Assets/HairAsset.h @@ -9,6 +9,7 @@ #pragma once #include +#include #include #include diff --git a/Gems/AtomTressFX/Code/Rendering/HairCommon.cpp b/Gems/AtomTressFX/Code/Rendering/HairCommon.cpp index 42fc2809fc..9b5fbc9333 100644 --- a/Gems/AtomTressFX/Code/Rendering/HairCommon.cpp +++ b/Gems/AtomTressFX/Code/Rendering/HairCommon.cpp @@ -39,7 +39,7 @@ namespace AZ Data::Instance UtilityClass::CreateShaderResourceGroup( Data::Instance shader, const char* shaderResourceGroupId, - const char* moduleName) + [[maybe_unused]] const char* moduleName) { Data::Instance srg = RPI::ShaderResourceGroup::Create(shader->GetAsset(), AZ::Name{ shaderResourceGroupId }); if (!srg) @@ -54,7 +54,7 @@ namespace AZ //! If srg is nullptr the index handle will NOT be set. //! This can be useful when creating a constant buffer or an image. Data::Instance UtilityClass::CreateBuffer( - const char* warningHeader, + [[maybe_unused]] const char* warningHeader, SrgBufferDescriptor& bufferDesc, Data::Instance srg) { @@ -84,7 +84,7 @@ namespace AZ } bool UtilityClass::BindBufferToSrg( - const char* warningHeader, + [[maybe_unused]] const char* warningHeader, Data::Instance buffer, SrgBufferDescriptor& bufferDesc, Data::Instance srg) diff --git a/Gems/AtomTressFX/Code/Rendering/HairFeatureProcessor.cpp b/Gems/AtomTressFX/Code/Rendering/HairFeatureProcessor.cpp index c56d4a3489..04f71a79c8 100644 --- a/Gems/AtomTressFX/Code/Rendering/HairFeatureProcessor.cpp +++ b/Gems/AtomTressFX/Code/Rendering/HairFeatureProcessor.cpp @@ -201,7 +201,6 @@ namespace AZ void HairFeatureProcessor::Simulate(const FeatureProcessor::SimulatePacket& packet) { AZ_PROFILE_FUNCTION(AzRender); - AZ_ATOM_PROFILE_FUNCTION("Hair", "HairFeatureProcessor: Simulate"); AZ_UNUSED(packet); if (m_hairRenderObjects.empty()) @@ -250,7 +249,6 @@ namespace AZ void HairFeatureProcessor::Render([[maybe_unused]] const FeatureProcessor::RenderPacket& packet) { AZ_PROFILE_FUNCTION(AzRender); - AZ_ATOM_PROFILE_FUNCTION("Hair", "HairFeatureProcessor: Render"); if (!m_initialized || !m_addDispatchEnabled) { // Skip adding dispatches / Draw packets for this frame until initialized and the shaders are ready diff --git a/Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp b/Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp index f006df6afd..a89a3eb1b8 100644 --- a/Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp +++ b/Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp @@ -387,7 +387,7 @@ namespace AZ //! Updates the buffers data for the hair generation. //! Notice: does not update the bone matrices that will be updated every frame. - bool HairRenderObject::UploadGPUData(const char* name, AMD::TressFXAsset* asset) + bool HairRenderObject::UploadGPUData([[maybe_unused]] const char* name, AMD::TressFXAsset* asset) { // The following must correlate the order in HairGenerationBuffersSemantics void* buffersData[uint8_t(HairGenerationBuffersSemantics::NumBufferStreams)] = { @@ -526,7 +526,7 @@ namespace AZ //! Creation of the render Srg m_hairRenderSrg, followed by creation and binding of the //! GPU render resources: vertex thickness, vertex UV, hair albedo maps and two constant buffers. bool HairRenderObject::CreateRenderingGPUResources( - Data::Instance shader, AMD::TressFXAsset& asset, const char* assetName) + Data::Instance shader, AMD::TressFXAsset& asset, [[maybe_unused]] const char* assetName) { //-------------------- Render Srg Creation --------------------- m_hairRenderSrg = UtilityClass::CreateShaderResourceGroup(shader, "HairRenderingMaterialSrg", "Hair Gem"); @@ -592,7 +592,7 @@ namespace AZ return false; } - RHI::ResultCode result = bufferPool->InitBuffer(request); + [[maybe_unused]] RHI::ResultCode result = bufferPool->InitBuffer(request); AZ_Error("Hair Gem", result == RHI::ResultCode::Success, "Failed to initialize index buffer - error [%d]", result); // create index buffer view diff --git a/Gems/AtomTressFX/External/Code/src/TressFX/TressFXAsset.cpp b/Gems/AtomTressFX/External/Code/src/TressFX/TressFXAsset.cpp index 19bb491489..58c66c3b8c 100644 --- a/Gems/AtomTressFX/External/Code/src/TressFX/TressFXAsset.cpp +++ b/Gems/AtomTressFX/External/Code/src/TressFX/TressFXAsset.cpp @@ -776,9 +776,11 @@ namespace AMD EI_Read((char*)&skinData.weight[j], sizeof(AMD::real32), ioObject); } +#if defined(AZ_ENABLE_TRACING) float weightSum = skinData.weight[0] + skinData.weight[1] + skinData.weight[2] + skinData.weight[3]; - AZ_Assert(weightSum > 0.0f, "Weight sum should be greater than 0"); +#endif // AZ_ENABLE_TRACING + assert(skinData.weight[0] != 0.0f); // If bone index is -1, then it means that there is no bone associated to this. In this case we simply replace it with zero. @@ -854,9 +856,11 @@ namespace AMD stream->Read(sizeof(AMD::real32), &skinData.weight[j]); } +#if defined(AZ_ENABLE_TRACING) float weightSum = skinData.weight[0] + skinData.weight[1] + skinData.weight[2] + skinData.weight[3]; - AZ_Assert(weightSum > 0.0f, "Weight sum should be greater than 0"); +#endif // AZ_ENABLE_TRACING + assert(skinData.weight[0] != 0.0f); // If bone index is -1, then it means that there is no bone associated to this. In this case we simply replace it with zero. diff --git a/Gems/AtomTressFX/External/Code/src/TressFX/TressFXSettings.cpp b/Gems/AtomTressFX/External/Code/src/TressFX/TressFXSettings.cpp index 42ba6c5cdc..8c7e8a39cd 100644 --- a/Gems/AtomTressFX/External/Code/src/TressFX/TressFXSettings.cpp +++ b/Gems/AtomTressFX/External/Code/src/TressFX/TressFXSettings.cpp @@ -27,6 +27,8 @@ #include #include +#include + namespace AMD { void TressFXSimulationSettings::Reflect(AZ::ReflectContext* context)