summaryrefslogtreecommitdiffstats
path: root/Tests/TestApp/src/TestBufferAccess.cpp
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-11-24 22:15:03 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-11-24 22:15:03 +0000
commit4375948d5fdc587d1cf06d6581f9a4ddd780cc52 (patch)
tree9d015262812b226f261f15269159a8ee40ac819f /Tests/TestApp/src/TestBufferAccess.cpp
parentAdded explicit control over resource transitions in draw command (diff)
downloadDiligentEngine-4375948d5fdc587d1cf06d6581f9a4ddd780cc52.tar.gz
DiligentEngine-4375948d5fdc587d1cf06d6581f9a4ddd780cc52.zip
Moved/renamed `IBuffer::UpdateData()` to `IDeviceContext::UpdateBuffer()`
Moved/renamed `IBuffer::CopyData()` to `IDeviceContext::CopyBuffer()`
Diffstat (limited to 'Tests/TestApp/src/TestBufferAccess.cpp')
-rw-r--r--Tests/TestApp/src/TestBufferAccess.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp
index 4ae28b2..b1db1df 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_pInstBuff[1]->UpdateData( m_pDeviceContext, sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2] );
+ m_pDeviceContext->UpdateBuffer(m_pInstBuff[1], sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2] );
pBuffs[3] = m_pInstBuff[1];
m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET );
@@ -197,8 +197,8 @@ 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_pInstBuff[2]->UpdateData( m_pDeviceContext, sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2] );
- m_pInstBuff[1]->CopyData( m_pDeviceContext, m_pInstBuff[2], sizeof( float ) * 2, sizeof( float ) * 2, sizeof( float ) * 4 );
+ m_pDeviceContext->UpdateBuffer(m_pInstBuff[2], sizeof( float ) * 2, sizeof( float ) * 4, &instance_offsets[2] );
+ m_pDeviceContext->CopyBuffer(m_pInstBuff[2], m_pInstBuff[1], sizeof( float ) * 2, sizeof( float ) * 2, sizeof( float ) * 4 );
m_pDeviceContext->Draw(DrawAttrs);
@@ -225,7 +225,7 @@ void TestBufferAccess::Draw(float fTime)
MapHelper<float> pStagingData;
// Test reading data from staging resource
{
- m_pInstBuff[4]->CopyData( m_pDeviceContext, m_pInstBuff[3], 0, 0, sizeof( instance_offsets ) );
+ m_pDeviceContext->CopyBuffer(m_pInstBuff[3], m_pInstBuff[4], 0, 0, sizeof( instance_offsets ) );
pStagingData.Map( m_pDeviceContext, m_pInstBuff[4], MAP_READ, 0 );
for(int i = 0; i < _countof(instance_offsets); ++i)
assert(pStagingData[i] == instance_offsets[i]);
@@ -246,7 +246,7 @@ void TestBufferAccess::Draw(float fTime)
pStagingData.Unmap();
}
- m_pInstBuff[2]->CopyData( m_pDeviceContext, m_pInstBuff[5], 0, 0, sizeof( instance_offsets ) );
+ m_pDeviceContext->CopyBuffer(m_pInstBuff[5], m_pInstBuff[2], 0, 0, sizeof( instance_offsets ) );
pBuffs[3] = m_pInstBuff[2];
m_pDeviceContext->SetVertexBuffers( 0, _countof( pBuffs ), pBuffs, Offsets, SET_VERTEX_BUFFERS_FLAG_RESET );
m_pDeviceContext->Draw(DrawAttrs);
@@ -266,7 +266,7 @@ void TestBufferAccess::Draw(float fTime)
fPrevTime = fTime;
}*/
- m_pInstBuff[2]->CopyData( m_pDeviceContext, m_pInstBuff[6], 0, 0, sizeof( instance_offsets ) );
+ m_pDeviceContext->CopyBuffer(m_pInstBuff[6], m_pInstBuff[2], 0, 0, sizeof( instance_offsets ) );
m_pDeviceContext->Draw(DrawAttrs);
}
}