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 --- Tests/TestApp/src/TestBufferAccess.cpp | 6 +++--- Tests/TestApp/src/TestDrawCommands.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Tests/TestApp/src') 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