Bladeren bron

Update the function to pass in pointers.

jiaweig 4 jaren geleden
bovenliggende
commit
becee53e34

+ 1 - 1
Gem/Code/Source/ParallaxMappingExampleComponent.cpp

@@ -77,7 +77,7 @@ namespace AtomSampleViewer
     void ParallaxMappingExampleComponent::Activate()
     {
         // Asset
-        m_planeAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/plane.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
+        m_planeAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/PlaneWithMultipleUVs.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
         m_boxAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::ModelAsset>("objects/cube.azmodel", AZ::RPI::AssetUtils::TraceLevel::Assert);
         m_parallaxMaterialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("testdata/materials/parallaxrock.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);
         m_defaultMaterialAsset = AZ::RPI::AssetUtils::GetAssetByProductPath<AZ::RPI::MaterialAsset>("materials/defaultpbr.azmaterial", AZ::RPI::AssetUtils::TraceLevel::Assert);

+ 2 - 7
Gem/Code/Source/RHI/AsyncComputeExampleComponent.cpp

@@ -340,11 +340,10 @@ namespace AtomSampleViewer
             {
                 // Model Pipeline
                 Data::Instance<AZ::RPI::ModelLod> modelLod = m_model->GetLods()[0];
-
                 modelLod->GetStreamsForMesh(
                     pipelineDesc.m_inputStreamLayout,
                     m_modelStreamBufferViews[ShadowScope],
-                    m_uvStreamTangentIndex,
+                    nullptr,
                     variant.GetInputContract(),
                     0);
 
@@ -401,12 +400,10 @@ namespace AtomSampleViewer
             {
                 // Model Pipeline
                 Data::Instance<AZ::RPI::ModelLod> modelLod = m_model->GetLods()[0];
-                AZ::RPI::UvStreamTangentIndex uvStreamTangentIndex;
-
                 modelLod->GetStreamsForMesh(
                     pipelineDesc.m_inputStreamLayout,
                     m_modelStreamBufferViews[ForwardScope],
-                    uvStreamTangentIndex,
+                    nullptr,
                     variant.GetInputContract(),
                     0);
 
@@ -967,8 +964,6 @@ namespace AtomSampleViewer
             for (const auto& shaderResourceGroup : m_shaderResourceGroups[ForwardScope])
             {
                 shaderResourceGroup->SetImageView(m_shaderInputImageIndex, imageView);
-                RHI::ShaderInputNameIndex shaderUvStreamTangentIndex = "m_uvStreamTangentIndex";
-                shaderResourceGroup->SetConstant(shaderUvStreamTangentIndex, m_uvStreamTangentIndex);
                 shaderResourceGroup->Compile();
             }
         };

+ 0 - 2
Gem/Code/Source/RHI/AsyncComputeExampleComponent.h

@@ -152,8 +152,6 @@ namespace AtomSampleViewer
         // Camera projection matrix
         AZ::Matrix4x4 m_projectionMatrix;
 
-        AZ::RPI::UvStreamTangentIndex m_uvStreamTangentIndex;
-
         AZStd::array<AZStd::vector<AZ::Data::Instance<AZ::RPI::ShaderResourceGroup>>, NumScopes> m_shaderResourceGroups;
         AZ::Data::Instance<AZ::RPI::ShaderResourceGroup> m_viewShaderResourceGroup;
         AZ::RHI::ShaderInputImageIndex m_shaderInputImageIndex;

+ 2 - 4
Gem/Code/Source/RHI/BindlessPrototypeExampleComponent.cpp

@@ -277,8 +277,7 @@ namespace AtomSampleViewer
             // Set the buffer stream
             RHI::InputStreamLayout layout;
             const ShaderVariant& shaderVariant = m_shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId);
-            AZ::RPI::UvStreamTangentIndex uvStreamTangentIndex;
-            m_model->GetLods()[lodModel]->GetStreamsForMesh(layout, subMeshInstance.bufferStreamViewArray, uvStreamTangentIndex, shaderVariant.GetInputContract(), subMeshIdx);
+            m_model->GetLods()[lodModel]->GetStreamsForMesh(layout, subMeshInstance.bufferStreamViewArray, nullptr, shaderVariant.GetInputContract(), subMeshIdx);
         }
     }
 
@@ -431,8 +430,7 @@ namespace AtomSampleViewer
             RHI::InputStreamLayout layout;
             ModelLod::StreamBufferViewList streamBufferView;
             const ShaderVariant& shaderVariant = m_shader->GetVariant(RPI::ShaderAsset::RootShaderVariantStableId);
-            AZ::RPI::UvStreamTangentIndex dummyUvStreamTangentIndex;
-            m_model->GetLods()[m_modelLod]->GetStreamsForMesh(layout, streamBufferView, dummyUvStreamTangentIndex, shaderVariant.GetInputContract(), meshIndex);
+            m_model->GetLods()[m_modelLod]->GetStreamsForMesh(layout, streamBufferView, nullptr, shaderVariant.GetInputContract(), meshIndex);
             // Set the pipeline state
             {
                 RHI::PipelineStateDescriptorForDraw pipelineStateDescriptor;

+ 1 - 3
Gem/Code/Source/RHI/SubpassExampleComponent.cpp

@@ -262,12 +262,10 @@ namespace AtomSampleViewer
             {
                 Data::Instance<AZ::RPI::ModelLod> modelLod = m_models[modelData.m_modelType]->GetLods()[0];
 
-                AZ::RPI::UvStreamTangentIndex dummyUvStreamTangentIndex;
-
                 modelLod->GetStreamsForMesh(
                     pipelineDesc.m_inputStreamLayout,
                     modelData.m_streamBufferList,
-                    dummyUvStreamTangentIndex,
+                    nullptr,
                     variant.GetInputContract(),
                     0);
 

+ 1 - 2
Gem/Code/Source/RootConstantsExampleComponent.cpp

@@ -179,14 +179,13 @@ namespace AtomSampleViewer
                 if (model)
                 {
                     Data::Instance<AZ::RPI::ModelLod> modelLod = model->GetLods()[0];
-                    AZ::RPI::UvStreamTangentIndex dummyUvStreamTangentIndex;
 
                     m_modelStreamBufferViews[i].resize(modelLod->GetMeshes().size());
 
                     for (uint32_t j = 0; j < m_modelStreamBufferViews[i].size(); ++j)
                     {
                         modelLod->GetStreamsForMesh(
-                            pipelineStateDescriptor.m_inputStreamLayout, m_modelStreamBufferViews[i][j], dummyUvStreamTangentIndex, shaderVariant.GetInputContract(),
+                            pipelineStateDescriptor.m_inputStreamLayout, m_modelStreamBufferViews[i][j], nullptr, shaderVariant.GetInputContract(),
                             j);
                     }
                 }