From b1d81b27f895e6fc45396bf7d7434c3ad11c9c83 Mon Sep 17 00:00:00 2001 From: hultonha Date: Mon, 19 Apr 2021 18:24:27 +0100 Subject: [PATCH 1/2] WIP changes to fix White Box rendering with Atom --- Gems/WhiteBox/Assets/materials/DefaultPBR.material | 4 ++++ Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Gems/WhiteBox/Assets/materials/DefaultPBR.material diff --git a/Gems/WhiteBox/Assets/materials/DefaultPBR.material b/Gems/WhiteBox/Assets/materials/DefaultPBR.material new file mode 100644 index 0000000000..f0990f148c --- /dev/null +++ b/Gems/WhiteBox/Assets/materials/DefaultPBR.material @@ -0,0 +1,4 @@ +{ + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "Materials/Presets/PBR/default_grid.material" +} diff --git a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h index bea6de5898..a8f709c361 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h +++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h @@ -98,7 +98,7 @@ namespace WhiteBox // specify the data format for vertex stream data AZ::RHI::BufferDescriptor bufferDescriptor; - bufferDescriptor.m_bindFlags = AZ::RHI::BufferBindFlags::InputAssembly | AZ::RHI::BufferBindFlags::ShaderRead; + bufferDescriptor.m_bindFlags = AZ::RHI::BufferBindFlags::DynamicInputAssembly | AZ::RHI::BufferBindFlags::ShaderRead; bufferDescriptor.m_byteCount = bufferSize; bufferDescriptor.m_alignment = elementSize; From 8f200ed3cf462cd56a1415baa26df62a05a1f38d Mon Sep 17 00:00:00 2001 From: hultonha Date: Mon, 26 Apr 2021 13:50:49 +0100 Subject: [PATCH 2/2] undo InputAssembly change --- Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h index c3683607f7..9d8f327616 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h +++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h @@ -98,7 +98,7 @@ namespace WhiteBox // specify the data format for vertex stream data AZ::RHI::BufferDescriptor bufferDescriptor; - bufferDescriptor.m_bindFlags = AZ::RHI::BufferBindFlags::DynamicInputAssembly | AZ::RHI::BufferBindFlags::ShaderRead; + bufferDescriptor.m_bindFlags = AZ::RHI::BufferBindFlags::InputAssembly | AZ::RHI::BufferBindFlags::ShaderRead; bufferDescriptor.m_byteCount = bufferSize; bufferDescriptor.m_alignment = elementSize;