From fb415324592e0762f455ebdf88b6963eae41b1ca Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 18 Feb 2019 17:55:51 -0800 Subject: Updated input layout element to use explicit AutoOffset and AutoStride --- DiligentCore | 2 +- DiligentFX | 2 +- DiligentSamples | 2 +- Tests/TestApp/assets/TestRenderScripts.lua | 2 +- Tests/TestApp/src/TestBufferAccess.cpp | 6 +++--- Tests/TestApp/src/TestDrawCommands.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DiligentCore b/DiligentCore index 251cbf3..082ad1f 160000 --- a/DiligentCore +++ b/DiligentCore @@ -1 +1 @@ -Subproject commit 251cbf3fa84ff8b660714d5f413232c189664a8a +Subproject commit 082ad1f8419e9463d915d0706006268cd0135307 diff --git a/DiligentFX b/DiligentFX index 4977af3..c890c07 160000 --- a/DiligentFX +++ b/DiligentFX @@ -1 +1 @@ -Subproject commit 4977af32bc6f98e81bed31be3325d8b52d46e567 +Subproject commit c890c07798b4226a461ac7199e24ef54c7259a24 diff --git a/DiligentSamples b/DiligentSamples index ed072c3..74db13c 160000 --- a/DiligentSamples +++ b/DiligentSamples @@ -1 +1 @@ -Subproject commit ed072c32c6facba002fdf0702a7c40eb6a88f967 +Subproject commit 74db13c8205438a3fef0a8821ecce5e069a08c2d diff --git a/Tests/TestApp/assets/TestRenderScripts.lua b/Tests/TestApp/assets/TestRenderScripts.lua index 10401d7..94ea53a 100644 --- a/Tests/TestApp/assets/TestRenderScripts.lua +++ b/Tests/TestApp/assets/TestRenderScripts.lua @@ -120,7 +120,7 @@ PSOInst = PipelineState.Create { { InputIndex = 0, BufferSlot = 0, NumComponents = 3, ValueType = "VT_FLOAT32", IsNormalized = false, Stride = 4*3}, { InputIndex = 1, BufferSlot = 1, NumComponents = 4, ValueType = "VT_UINT8", IsNormalized = true, Stride = 4*1}, - { InputIndex = 2, BufferSlot = 2, NumComponents = 2, ValueType = "VT_FLOAT32", IsNormalized = false, Frequency = "FREQUENCY_PER_INSTANCE", Stride = 0}, + { InputIndex = 2, BufferSlot = 2, NumComponents = 2, ValueType = "VT_FLOAT32", IsNormalized = false, Frequency = "FREQUENCY_PER_INSTANCE"}, }, PrimitiveTopology = "PRIMITIVE_TOPOLOGY_TRIANGLE_LIST", pVS = MinimalInstVS, diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp index 712c2e3..2cfd946 100644 --- a/Tests/TestApp/src/TestBufferAccess.cpp +++ b/Tests/TestApp/src/TestBufferAccess.cpp @@ -147,9 +147,9 @@ void TestBufferAccess::Init( IRenderDevice *pDevice, IDeviceContext *pContext, I LayoutElement Elems[] = { - LayoutElement{ 0, 1, 3, Diligent::VT_FLOAT32, false, 0 }, - LayoutElement{ 1, 1, 3, Diligent::VT_FLOAT32, false, sizeof( float ) * 3, sizeof( float ) * 6 }, - LayoutElement{ 2, 3, 2, Diligent::VT_FLOAT32, false, 0, 0, LayoutElement::FREQUENCY_PER_INSTANCE } + LayoutElement{ 1, 1, 3, Diligent::VT_FLOAT32, false, sizeof(float) * 3, sizeof(float) * 6 }, + LayoutElement{ 0, 1, 3, Diligent::VT_FLOAT32, false, 0, sizeof(float) * 6 }, + LayoutElement{ 2, 3, 2, Diligent::VT_FLOAT32, false, LayoutElement::AutoOffset, LayoutElement::AutoStride, LayoutElement::FREQUENCY_PER_INSTANCE } }; PSODesc.GraphicsPipeline.InputLayout.LayoutElements = Elems; PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof( Elems ); diff --git a/Tests/TestApp/src/TestDrawCommands.cpp b/Tests/TestApp/src/TestDrawCommands.cpp index a0a4c24..c2f9ed8 100644 --- a/Tests/TestApp/src/TestDrawCommands.cpp +++ b/Tests/TestApp/src/TestDrawCommands.cpp @@ -227,7 +227,7 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont { LayoutElement{ 0, 0, 3, VT_FLOAT32, false, 0 }, LayoutElement{ 1, 0, 3, VT_FLOAT32, false, sizeof( float ) * 3 }, - LayoutElement{ 2, 1, 2, VT_FLOAT32, false, 0, 0, LayoutElement::FREQUENCY_PER_INSTANCE } + LayoutElement{ 2, 1, 2, VT_FLOAT32, false, LayoutElement::AutoOffset, LayoutElement::AutoStride, LayoutElement::FREQUENCY_PER_INSTANCE } }; PSODesc.GraphicsPipeline.InputLayout.LayoutElements = Elems; PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof( Elems ); -- cgit v1.2.3