diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-12-03 17:33:43 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-12-03 17:33:43 +0000 |
| commit | 54bdcc4e5c3aac56d22da3aaf3cac10dd6807bdf (patch) | |
| tree | f3911330de9cac5af8f8045270b0879585e3bb2a /Tests/TestApp/src/TestBufferAccess.cpp | |
| parent | Fixed linux build (diff) | |
| download | DiligentEngine-54bdcc4e5c3aac56d22da3aaf3cac10dd6807bdf.tar.gz DiligentEngine-54bdcc4e5c3aac56d22da3aaf3cac10dd6807bdf.zip | |
Updated the API (SetVertexBuffers, SetIndexBuffers, DRAW_FLAGS and other)
Diffstat (limited to 'Tests/TestApp/src/TestBufferAccess.cpp')
| -rw-r--r-- | Tests/TestApp/src/TestBufferAccess.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp index 09e6e12..e75a51d 100644 --- a/Tests/TestApp/src/TestBufferAccess.cpp +++ b/Tests/TestApp/src/TestBufferAccess.cpp @@ -166,12 +166,12 @@ void TestBufferAccess::Draw(float fTime) 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 ); + m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, SET_VERTEX_BUFFERS_FLAG_RESET ); DrawAttribs DrawAttrs; DrawAttrs.NumVertices = 3; DrawAttrs.NumInstances = NumInstances; - DrawAttrs.Flags = DRAW_FLAG_TRANSITION_VERTEX_BUFFERS; + DrawAttrs.Flags = DRAW_FLAG_VERIFY_STATES; m_pDeviceContext->Draw(DrawAttrs); @@ -187,7 +187,7 @@ void TestBufferAccess::Draw(float fTime) m_pDeviceContext->UpdateBuffer(m_pInstBuff[1], sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2], RESOURCE_STATE_TRANSITION_MODE_TRANSITION ); pBuffs[3] = m_pInstBuff[1]; - m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET ); + m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, SET_VERTEX_BUFFERS_FLAG_RESET ); m_pDeviceContext->Draw(DrawAttrs); @@ -199,7 +199,8 @@ void TestBufferAccess::Draw(float fTime) } m_pDeviceContext->UpdateBuffer(m_pInstBuff[2], sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2], RESOURCE_STATE_TRANSITION_MODE_TRANSITION ); m_pDeviceContext->CopyBuffer(m_pInstBuff[2], sizeof( float ) * 2, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, m_pInstBuff[1], sizeof( float ) * 2, sizeof( float ) * 4, RESOURCE_STATE_TRANSITION_MODE_TRANSITION ); - + StateTransitionDesc Barrier(m_pInstBuff[1], RESOURCE_STATE_UNKNOWN, RESOURCE_STATE_VERTEX_BUFFER, true); + m_pDeviceContext->TransitionResourceStates(1, &Barrier); m_pDeviceContext->Draw(DrawAttrs); for(int Inst = 0; Inst < NumInstances; ++Inst) @@ -215,7 +216,7 @@ void TestBufferAccess::Draw(float fTime) } pBuffs[3] = m_pInstBuff[3]; - m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET ); + m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, SET_VERTEX_BUFFERS_FLAG_RESET ); m_pDeviceContext->Draw(DrawAttrs); @@ -254,7 +255,7 @@ void TestBufferAccess::Draw(float fTime) m_pDeviceContext->TransitionResourceStates(2, Barriers); m_pDeviceContext->CopyBuffer(m_pInstBuff[5], 0, RESOURCE_STATE_TRANSITION_MODE_VERIFY, m_pInstBuff[2], 0, sizeof( instance_offsets ), RESOURCE_STATE_TRANSITION_MODE_VERIFY ); pBuffs[3] = m_pInstBuff[2]; - m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET ); + m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, RESOURCE_STATE_TRANSITION_MODE_TRANSITION, SET_VERTEX_BUFFERS_FLAG_RESET ); m_pDeviceContext->Draw(DrawAttrs); |