diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-12-02 17:44:18 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-12-02 17:44:18 +0000 |
| commit | 01550d82a14b3502ab70098e89d2a2b2d67a6940 (patch) | |
| tree | 3546025a073a6331e9751a0719612e83b774f9ea /Tests/TestApp/src | |
| parent | Fixed linux build error (diff) | |
| download | DiligentEngine-01550d82a14b3502ab70098e89d2a2b2d67a6940.tar.gz DiligentEngine-01550d82a14b3502ab70098e89d2a2b2d67a6940.zip | |
Added explicit state transition control to UpdateBuffer and UpdateTexture commands
Diffstat (limited to 'Tests/TestApp/src')
| -rw-r--r-- | Tests/TestApp/src/TestApp.cpp | 2 | ||||
| -rw-r--r-- | Tests/TestApp/src/TestBufferAccess.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp index a4b0519..ab0b088 100644 --- a/Tests/TestApp/src/TestApp.cpp +++ b/Tests/TestApp/src/TestApp.cpp @@ -638,7 +638,7 @@ void TestApp::Render() double dCurrTime = m_CurrTime; float instance_offsets[] = { -0.3f, (float)sin(dCurrTime + 0.5)*0.1f, 0.0f, (float)sin(dCurrTime)*0.1f, +0.3f, -0.3f + (float)cos(dCurrTime)*0.1f }; - m_pImmediateContext->UpdateBuffer(m_pInstBuff2, sizeof(float) * 1, sizeof(float) * 5, &instance_offsets[1]); + m_pImmediateContext->UpdateBuffer(m_pInstBuff2, sizeof(float) * 1, sizeof(float) * 5, &instance_offsets[1], RESOURCE_STATE_TRANSITION_MODE_TRANSITION); m_pImmediateContext->CopyBuffer(m_pInstBuff2, sizeof(float) * 2, m_pInstBuff, sizeof(float) * 2, sizeof(float) * 4); { diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp index ac36264..14d097b 100644 --- a/Tests/TestApp/src/TestBufferAccess.cpp +++ b/Tests/TestApp/src/TestBufferAccess.cpp @@ -184,7 +184,7 @@ void TestBufferAccess::Draw(float fTime) instance_offsets[Inst*2] = (1+Inst) * fDX; instance_offsets[Inst*2+1] = 1.f * fDY + sin(fTime) * fDY * 0.3f; } - m_pDeviceContext->UpdateBuffer(m_pInstBuff[1], sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2] ); + 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 ); @@ -197,7 +197,7 @@ void TestBufferAccess::Draw(float fTime) instance_offsets[Inst*2] = (1+Inst) * fDX; instance_offsets[Inst*2+1] = 2.f * fDY + sin(fTime*0.8f) * fDY * 0.3f; } - m_pDeviceContext->UpdateBuffer(m_pInstBuff[2], sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2] ); + 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, m_pInstBuff[1], sizeof( float ) * 2, sizeof( float ) * 4 ); m_pDeviceContext->Draw(DrawAttrs); |