From f19443a40478482154b783950c0780485d699b7c Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Wed, 22 Aug 2018 07:40:27 -0700 Subject: Updated core (implemented shader variable access by index) --- Tests/TestApp/src/TestBufferAccess.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Tests/TestApp/src/TestBufferAccess.cpp') diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp index 4a25140..578abf1 100644 --- a/Tests/TestApp/src/TestBufferAccess.cpp +++ b/Tests/TestApp/src/TestBufferAccess.cpp @@ -145,9 +145,9 @@ void TestBufferAccess::Init( IRenderDevice *pDevice, IDeviceContext *pContext, I LayoutElement Elems[] = { - LayoutElement( 0, 0, 3, Diligent::VT_FLOAT32, false, 0 ), - LayoutElement( 1, 0, 3, Diligent::VT_FLOAT32, false, sizeof( float ) * 3, sizeof( float ) * 6), - LayoutElement( 2, 1, 2, Diligent::VT_FLOAT32, false, 0, 0, LayoutElement::FREQUENCY_PER_INSTANCE ) + 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 ) }; PSODesc.GraphicsPipeline.InputLayout.LayoutElements = Elems; PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof( Elems ); @@ -162,8 +162,8 @@ void TestBufferAccess::Draw(float fTime) //m_pDeviceContext->TransitionShaderResources(m_pPSO, nullptr); //m_pDeviceContext->CommitShaderResources(nullptr); - IBuffer *pBuffs[2] = {m_pVertexBuff, m_pInstBuff[0]}; - Uint32 Offsets[] = {0, 0}; + IBuffer *pBuffs[] = {nullptr, m_pVertexBuff, nullptr, m_pInstBuff[0], nullptr}; + Uint32 Offsets[_countof( pBuffs )] = {0, 0, 0, 0, 0}; m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET ); Diligent::DrawAttribs DrawAttrs; @@ -183,7 +183,7 @@ void TestBufferAccess::Draw(float fTime) } m_pInstBuff[1]->UpdateData( m_pDeviceContext, sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2] ); - pBuffs[1] = m_pInstBuff[1]; + pBuffs[3] = m_pInstBuff[1]; m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET ); m_pDeviceContext->Draw(DrawAttrs); @@ -211,7 +211,7 @@ void TestBufferAccess::Draw(float fTime) memcpy(pInstData, instance_offsets, sizeof(instance_offsets)); } - pBuffs[1] = m_pInstBuff[3]; + pBuffs[3] = m_pInstBuff[3]; m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET ); m_pDeviceContext->Draw(DrawAttrs); @@ -244,7 +244,7 @@ void TestBufferAccess::Draw(float fTime) } m_pInstBuff[2]->CopyData( m_pDeviceContext, m_pInstBuff[5], 0, 0, sizeof( instance_offsets ) ); - pBuffs[1] = m_pInstBuff[2]; + pBuffs[3] = m_pInstBuff[2]; m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET ); m_pDeviceContext->Draw(DrawAttrs); -- cgit v1.2.3