Просмотр исходного кода

Fix compilation after RHI::GeometryView added constructor with MultiDevice::DeviceMask parameter

Signed-off-by: Markus Prettner <[email protected]>
Markus Prettner 1 месяц назад
Родитель
Сommit
874a39b1da
29 измененных файлов с 33 добавлено и 32 удалено
  1. 1 1
      Gem/Code/Source/BloomExampleComponent.h
  2. 1 1
      Gem/Code/Source/RHI/AlphaToCoverageExampleComponent.h
  3. 2 1
      Gem/Code/Source/RHI/AsyncComputeExampleComponent.h
  4. 1 1
      Gem/Code/Source/RHI/ComputeExampleComponent.h
  5. 1 1
      Gem/Code/Source/RHI/CopyQueueComponent.h
  6. 1 1
      Gem/Code/Source/RHI/DualSourceBlendingComponent.h
  7. 1 1
      Gem/Code/Source/RHI/IndirectRenderingExampleComponent.cpp
  8. 1 1
      Gem/Code/Source/RHI/InputAssemblyExampleComponent.h
  9. 1 1
      Gem/Code/Source/RHI/MRTExampleComponent.h
  10. 2 2
      Gem/Code/Source/RHI/MSAAExampleComponent.h
  11. 1 1
      Gem/Code/Source/RHI/MatrixAlignmentTestExampleComponent.h
  12. 2 2
      Gem/Code/Source/RHI/MultiGPUExampleComponent.h
  13. 1 1
      Gem/Code/Source/RHI/MultiThreadComponent.h
  14. 1 1
      Gem/Code/Source/RHI/MultipleViewsComponent.h
  15. 1 1
      Gem/Code/Source/RHI/QueryExampleComponent.h
  16. 1 1
      Gem/Code/Source/RHI/RayTracingExampleComponent.h
  17. 1 1
      Gem/Code/Source/RHI/SphericalHarmonicsExampleComponent.h
  18. 2 2
      Gem/Code/Source/RHI/StencilExampleComponent.h
  19. 1 1
      Gem/Code/Source/RHI/SubpassExampleComponent.h
  20. 1 1
      Gem/Code/Source/RHI/Texture3dExampleComponent.h
  21. 1 1
      Gem/Code/Source/RHI/TextureArrayExampleComponent.h
  22. 1 1
      Gem/Code/Source/RHI/TextureExampleComponent.h
  23. 1 1
      Gem/Code/Source/RHI/TextureMapExampleComponent.h
  24. 1 1
      Gem/Code/Source/RHI/TriangleExampleComponent.h
  25. 1 1
      Gem/Code/Source/RHI/TrianglesConstantBufferExampleComponent.h
  26. 1 1
      Gem/Code/Source/RHI/VariableRateShadingExampleComponent.h
  27. 1 1
      Gem/Code/Source/RHI/XRExampleComponent.h
  28. 1 1
      Gem/Code/Source/StreamingImageExampleComponent.h
  29. 1 1
      Gem/Code/Source/TonemappingExampleComponent.h

+ 1 - 1
Gem/Code/Source/BloomExampleComponent.h

@@ -98,7 +98,7 @@ namespace AtomSampleViewer
         AZ::RHI::DrawListTag m_drawListTag;
         AZ::Data::Asset<AZ::RPI::ShaderAsset> m_shaderAsset;
         AZ::RHI::Ptr<AZ::RHI::ShaderResourceGroupLayout> m_srgLayout;
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         // shader input indices
         AZ::RHI::ShaderInputNameIndex m_imageInputIndex = "m_texture";

+ 1 - 1
Gem/Code/Source/RHI/AlphaToCoverageExampleComponent.h

@@ -93,7 +93,7 @@ namespace AtomSampleViewer
         };
         AZ::RHI::Ptr<AZ::RHI::BufferPool> m_inputAssemblyBufferPool;
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_rectangleInputAssemblyBuffer;
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         AZ::RHI::InputStreamLayout m_rectangleInputStreamLayout;
 
         // Shader Resource

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

@@ -122,7 +122,8 @@ namespace AtomSampleViewer
         // Quad related variables
         AZ::RHI::Ptr<AZ::RHI::BufferPool> m_quadBufferPool;
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_quadInputAssemblyBuffer;
-        AZStd::array<AZ::RHI::GeometryView, NumScopes> m_geometryViews;
+        AZStd::fixed_vector<AZ::RHI::GeometryView, NumScopes> m_geometryViews{ NumScopes,
+                                                                               AZ::RHI::GeometryView{ AZ::RHI::MultiDevice::AllDevices } };
 
         // Terrain related variables
         AZStd::array<AZ::RHI::ConstPtr<AZ::RHI::PipelineState>, NumScopes> m_terrainPipelineStates;

+ 1 - 1
Gem/Code/Source/RHI/ComputeExampleComponent.h

@@ -83,7 +83,7 @@ namespace AtomSampleViewer
         AZ::RHI::Ptr<AZ::RHI::BufferPool> m_inputAssemblyBufferPool;
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_inputAssemblyBuffer;
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         AZ::RHI::InputStreamLayout m_inputStreamLayout;
 
         // ----------------------------

+ 1 - 1
Gem/Code/Source/RHI/CopyQueueComponent.h

@@ -93,7 +93,7 @@ namespace AtomSampleViewer
 
         BufferData m_bufferData;
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         static const int numberOfPaths = 3;
         const char* m_filePaths[numberOfPaths] = {

+ 1 - 1
Gem/Code/Source/RHI/DualSourceBlendingComponent.h

@@ -63,7 +63,7 @@ namespace AtomSampleViewer
         AZ::RHI::Ptr<AZ::RHI::BufferPool> m_inputAssemblyBufferPool;
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_inputAssemblyBuffer;
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         AZ::RHI::InputStreamLayout m_inputStreamLayout;
 
         // ----------------------------------

+ 1 - 1
Gem/Code/Source/RHI/IndirectRenderingExampleComponent.cpp

@@ -878,7 +878,7 @@ namespace AtomSampleViewer
         using namespace AZ;
 
         m_numObjects = s_maxNumberOfObjects / 2;
-        m_geometryViews.resize(m_numObjects);
+        m_geometryViews.resize(m_numObjects, RHI::GeometryView(RHI::MultiDevice::AllDevices));
 
         RHI::Ptr<RHI::Device> device = Utils::GetRHIDevice();
 

+ 1 - 1
Gem/Code/Source/RHI/InputAssemblyExampleComponent.h

@@ -65,7 +65,7 @@ namespace AtomSampleViewer
         // -------------------------------------------------
         // Input Assembly buffer and its Streams/Index Views
         // -------------------------------------------------
-        AZ::RHI::GeometryView m_geometryView[2];
+        AZStd::fixed_vector<AZ::RHI::GeometryView, 2> m_geometryView{ 2, AZ::RHI::GeometryView{ AZ::RHI::MultiDevice::AllDevices } };
         AZ::RHI::InputStreamLayout m_inputStreamLayout;
 
         AZ::RHI::Ptr<AZ::RHI::BufferPool> m_inputAssemblyBufferPool;

+ 1 - 1
Gem/Code/Source/RHI/MRTExampleComponent.h

@@ -79,7 +79,7 @@ namespace AtomSampleViewer
             AZStd::array<VertexUV, 4> m_uvs;
             AZStd::array<uint16_t, 6> m_indices;
         };
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         AZStd::array<AZ::RHI::AttachmentId, 3> m_attachmentID;
         AZ::RHI::ClearValue m_clearValue;

+ 2 - 2
Gem/Code/Source/RHI/MSAAExampleComponent.h

@@ -133,8 +133,8 @@ namespace AtomSampleViewer
             AZStd::array<uint16_t, 6> m_indices;
         };
 
-        AZ::RHI::GeometryView m_triangleGeometryView;
-        AZ::RHI::GeometryView m_quadGeometryView;
+        AZ::RHI::GeometryView m_triangleGeometryView{ AZ::RHI::MultiDevice::AllDevices };
+        AZ::RHI::GeometryView m_quadGeometryView{ AZ::RHI::MultiDevice::AllDevices };
         AZ::RHI::InputStreamLayout m_triangleInputStreamLayout;
         AZ::RHI::InputStreamLayout m_quadInputStreamLayout;
 

+ 1 - 1
Gem/Code/Source/RHI/MatrixAlignmentTestExampleComponent.h

@@ -175,7 +175,7 @@ namespace AtomSampleViewer
             AZStd::array<uint16_t, 6> m_indices;
         };
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         // ImGui stuff.
         ImGuiSidebar m_imguiSidebar;

+ 2 - 2
Gem/Code/Source/RHI/MultiGPUExampleComponent.h

@@ -76,7 +76,7 @@ namespace AtomSampleViewer
             AZStd::array<uint16_t, 3> m_indices;
         };
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         AZ::RHI::Ptr<AZ::RHI::ImagePool> m_imagePool{};
         AZStd::array<AZ::RHI::Ptr<AZ::RHI::Image>, 2> m_images;
         AZStd::array<AZ::RHI::AttachmentId, 2> m_imageAttachmentIds = { { AZ::RHI::AttachmentId("MultiGPURenderTexture1"),
@@ -107,7 +107,7 @@ namespace AtomSampleViewer
         AZ::RHI::Ptr<AZ::RHI::BufferPool> m_stagingBufferPoolToGPU{};
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_stagingBufferToGPU{};
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_inputAssemblyBufferComposite{};
-        AZ::RHI::GeometryView m_geometryViewComposite;
+        AZ::RHI::GeometryView m_geometryViewComposite{ AZ::RHI::MultiDevice::AllDevices };
         AZ::RHI::ConstPtr<AZ::RHI::PipelineState> m_pipelineStateComposite;
         AZ::RHI::Ptr<AZ::RHI::ShaderResourceGroupPool> m_shaderResourceGroupPoolComposite;
         AZ::RHI::Ptr<AZ::RHI::ShaderResourceGroup> m_shaderResourceGroupComposite;

+ 1 - 1
Gem/Code/Source/RHI/MultiThreadComponent.h

@@ -86,6 +86,6 @@ namespace AtomSampleViewer
         AZ::RHI::ShaderInputConstantIndex m_shaderIndexViewProj;
 
         AZ::RHI::AttachmentId m_depthStencilID;
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
     };
 } // namespace AtomSampleViewer

+ 1 - 1
Gem/Code/Source/RHI/MultipleViewsComponent.h

@@ -99,7 +99,7 @@ namespace AtomSampleViewer
         AZStd::array<AZ::RHI::ShaderInputConstantIndex, 6> m_shaderInputConstantIndices;
         AZ::RHI::ShaderInputImageIndex m_shaderInputImageIndex;
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         AZ::RHI::AttachmentId m_depthMapID;
         AZ::RHI::AttachmentId m_depthStencilID;
         AZ::RHI::ClearValue m_depthClearValue;

+ 1 - 1
Gem/Code/Source/RHI/QueryExampleComponent.h

@@ -101,7 +101,7 @@ namespace AtomSampleViewer
             AZStd::array<uint16_t, 6> m_indices;
         };
         AZ::RHI::InputStreamLayout m_quadInputStreamLayout;
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         AZStd::array<AZ::Data::Instance<AZ::RPI::ShaderResourceGroup>, 3> m_shaderResourceGroups;
         AZ::RHI::ShaderInputConstantIndex m_objectMatrixConstantIndex;

+ 1 - 1
Gem/Code/Source/RHI/RayTracingExampleComponent.h

@@ -134,7 +134,7 @@ namespace AtomSampleViewer
         };
 
         RHI::Ptr<RHI::Buffer> m_fullScreenInputAssemblyBuffer;
-        RHI::GeometryView m_geometryView;
+        RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         RHI::InputStreamLayout m_fullScreenInputStreamLayout;
 
         RHI::ConstPtr<RHI::PipelineState> m_drawPipelineState;

+ 1 - 1
Gem/Code/Source/RHI/SphericalHarmonicsExampleComponent.h

@@ -126,7 +126,7 @@ namespace AtomSampleViewer
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_indexBuffer;
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_positionBuffer;
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_uvBuffer;
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         struct BufferData
         {

+ 2 - 2
Gem/Code/Source/RHI/StencilExampleComponent.h

@@ -60,8 +60,8 @@ namespace AtomSampleViewer
             AZStd::array<uint16_t, s_numberOfVertices> m_indices;
         };
 
-        AZ::RHI::GeometryView m_geometryView;
-        AZ::RHI::GeometryView m_geometryView2;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
+        AZ::RHI::GeometryView m_geometryView2{ AZ::RHI::MultiDevice::AllDevices };
 
         AZ::RHI::AttachmentId m_depthStencilID;
         AZ::RHI::ClearValue m_depthClearValue;

+ 1 - 1
Gem/Code/Source/RHI/SubpassExampleComponent.h

@@ -110,7 +110,7 @@ namespace AtomSampleViewer
         AZ::RHI::AttachmentId m_positionAttachmentId;
         AZ::RHI::AttachmentId m_depthStencilAttachmentId;
 
-        AZ::RHI::GeometryView m_compositeGeometryView;
+        AZ::RHI::GeometryView m_compositeGeometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         AZ::EntityId m_cameraEntityId;
         AzFramework::EntityContextId m_entityContextId;

+ 1 - 1
Gem/Code/Source/RHI/Texture3dExampleComponent.h

@@ -54,7 +54,7 @@ namespace AtomSampleViewer
         AZ::RHI::Ptr<AZ::RHI::ImageView> m_imageView = nullptr;
         AZ::Data::Instance<AZ::RPI::ShaderResourceGroup> m_shaderResourceGroup = nullptr;
         AZ::RHI::ConstPtr<AZ::RHI::PipelineState> m_pipelineState = nullptr;
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         // Shader Input indices
         AZ::RHI::ShaderInputImageIndex m_texture3dInputIndex;

+ 1 - 1
Gem/Code/Source/RHI/TextureArrayExampleComponent.h

@@ -44,7 +44,7 @@ namespace AtomSampleViewer
         AZStd::array<AZ::RHI::StreamBufferView, 2> m_rectangleStreamBufferViews;
         AZ::RHI::InputStreamLayout m_rectangleInputStreamLayout;
         AZ::RHI::ConstPtr<AZ::RHI::PipelineState> m_pipelineState;
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         // Srg related resources
         AZ::Data::Instance<AZ::RPI::Shader> m_shader;

+ 1 - 1
Gem/Code/Source/RHI/TextureExampleComponent.h

@@ -56,7 +56,7 @@ namespace AtomSampleViewer
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_indexBuffer;
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_positionBuffer;
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_uvBuffer;
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         AZ::RHI::ConstPtr<AZ::RHI::PipelineState> m_pipelineState;
         AZ::Data::Instance<AZ::RPI::ShaderResourceGroup> m_shaderResourceGroup;

+ 1 - 1
Gem/Code/Source/RHI/TextureMapExampleComponent.h

@@ -56,7 +56,7 @@ namespace AtomSampleViewer
 
         struct BufferViewData
         {
-            AZ::RHI::GeometryView m_geometryView;
+            AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
             AZ::RHI::InputStreamLayout m_inputStreamLayout;
         };
         

+ 1 - 1
Gem/Code/Source/RHI/TriangleExampleComponent.h

@@ -60,6 +60,6 @@ namespace AtomSampleViewer
             AZStd::array<uint16_t, 3> m_indices;
         };
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
     };
 } // namespace AtomSampleViewer

+ 1 - 1
Gem/Code/Source/RHI/TrianglesConstantBufferExampleComponent.h

@@ -99,7 +99,7 @@ namespace AtomSampleViewer
 
         AZ::RHI::Ptr<AZ::RHI::BufferView> m_constantBufferView;
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         // --------------------------------------------------------
         // Pipeline state and SRG to be constructed from the shader

+ 1 - 1
Gem/Code/Source/RHI/VariableRateShadingExampleComponent.h

@@ -137,7 +137,7 @@ namespace AtomSampleViewer
         // Buffer for the IA of the full screen quad.
         AZ::RHI::Ptr<AZ::RHI::Buffer> m_inputAssemblyBuffer;
         // Geometry view for the full screen quad.
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         // Layout of the full screen quad.
         AZ::RHI::InputStreamLayout m_inputStreamLayout;
 

+ 1 - 1
Gem/Code/Source/RHI/XRExampleComponent.h

@@ -105,7 +105,7 @@ namespace AtomSampleViewer
             AZStd::array<uint16_t, 3> m_indices;
         };
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         float m_time = 0.0f;
         AZStd::array<AZ::Data::Instance<AZ::RPI::ShaderResourceGroup>, NumberOfCubes> m_shaderResourceGroups;
         AZStd::array<AZ::Matrix4x4, NumberOfCubes> m_modelMatrices;

+ 1 - 1
Gem/Code/Source/StreamingImageExampleComponent.h

@@ -183,7 +183,7 @@ namespace AtomSampleViewer
         AZ::Data::Asset<AZ::RPI::ShaderAsset> m_image3dShaderAsset;
         AZ::RHI::Ptr<AZ::RHI::ShaderResourceGroupLayout> m_image3dSrgLayout;
 
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
 
         // shader input indices
         AZ::RHI::ShaderInputImageIndex m_imageInputIndex;

+ 1 - 1
Gem/Code/Source/TonemappingExampleComponent.h

@@ -86,7 +86,7 @@ namespace AtomSampleViewer
         AZ::RPI::DynamicDrawInterface* m_dynamicDraw = nullptr;
 
         // render related data
-        AZ::RHI::GeometryView m_geometryView;
+        AZ::RHI::GeometryView m_geometryView{ AZ::RHI::MultiDevice::AllDevices };
         AZ::RHI::ConstPtr<AZ::RHI::PipelineState> m_pipelineState;
         AZ::RHI::DrawListTag m_drawListTag;
         AZ::Data::Asset<AZ::RPI::ShaderAsset> m_shaderAsset;