Renamed/moved ITexture::UpdateData() to IDeviceContext::UpdateTexture()

Renamed/moved IBuffer::CopyData() to IDeviceContext::CopyTexture()
Updated parameter order of IDeviceContext::CopyBuffer()

4 files changed, 19 insertions, 13 deletions

diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp
index 96578f9..f31ac56 100644
--- a/Tests/TestApp/src/TestApp.cpp
+++ b/Tests/TestApp/src/TestApp.cpp
@@ -639,7 +639,7 @@ void TestApp::Render()
     
     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->CopyBuffer(m_pInstBuff2, m_pInstBuff, sizeof(float) * 2, sizeof(float) * 2, sizeof(float) * 4);
+    m_pImmediateContext->CopyBuffer(m_pInstBuff2, sizeof(float) * 2, m_pInstBuff, sizeof(float) * 2, sizeof(float) * 4);
     
     {
         MapHelper<float> UniformData(m_pImmediateContext, m_pUniformBuff, MAP_WRITE, MAP_FLAG_DISCARD);
diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp
index b1db1df..0a31142 100644
--- a/Tests/TestApp/src/TestBufferAccess.cpp
+++ b/Tests/TestApp/src/TestBufferAccess.cpp
@@ -198,7 +198,7 @@ void TestBufferAccess::Draw(float fTime)
         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->CopyBuffer(m_pInstBuff[2], m_pInstBuff[1], sizeof( float ) * 2, sizeof( float ) * 2, sizeof( float ) * 4 );
+    m_pDeviceContext->CopyBuffer(m_pInstBuff[2], sizeof( float ) * 2, m_pInstBuff[1], 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_pDeviceContext->CopyBuffer(m_pInstBuff[3], m_pInstBuff[4], 0, 0, sizeof( instance_offsets ) );
+            m_pDeviceContext->CopyBuffer(m_pInstBuff[3], 0, m_pInstBuff[4], 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_pDeviceContext->CopyBuffer(m_pInstBuff[5], m_pInstBuff[2], 0, 0, sizeof( instance_offsets ) );
+            m_pDeviceContext->CopyBuffer(m_pInstBuff[5], 0, m_pInstBuff[2], 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_pDeviceContext->CopyBuffer(m_pInstBuff[6], m_pInstBuff[2], 0, 0, sizeof( instance_offsets ) );
+            m_pDeviceContext->CopyBuffer(m_pInstBuff[6], 0, m_pInstBuff[2], 0, sizeof( instance_offsets ) );
             m_pDeviceContext->Draw(DrawAttrs);
         }
     }
diff --git a/Tests/TestApp/src/TestCopyTexData.cpp b/Tests/TestApp/src/TestCopyTexData.cpp
index 01e0274..2be5c7f 100644
--- a/Tests/TestApp/src/TestCopyTexData.cpp
+++ b/Tests/TestApp/src/TestCopyTexData.cpp
@@ -108,10 +108,11 @@ void TestCopyTexData::Test2DTexture( TEXTURE_FORMAT Format )
     m_pDevice->CreateTexture( TexDesc, InitData, &pSrcTex );
     m_pDevice->CreateTexture( TexDesc, TextureData(), &pDstTex );
 
-    pDstTex->CopyData(m_pContext, pSrcTex,
+    m_pContext->CopyTexture(pSrcTex,
                       2, // Src mip
                       0, // Src slice
                       nullptr, // Box
+                      pDstTex,
                       1, // dst mip
                       0, // dst slice
                       32, 16, 0 // XYZ offset 
@@ -122,10 +123,11 @@ void TestCopyTexData::Test2DTexture( TEXTURE_FORMAT Format )
     SrcBox.MaxX = 19;
     SrcBox.MinY = 1;
     SrcBox.MaxY = 32;
-    pDstTex->CopyData(m_pContext, pSrcTex,
+    m_pContext->CopyTexture(pSrcTex,
                       2, // Src mip
                       0, // Src slice
                       &SrcBox, // Box
+                      pDstTex,
                       1, // dst mip
                       0, // dst slice
                       32, 16, 0 // XYZ offset 
@@ -166,10 +168,11 @@ void TestCopyTexData::Test2DTexArray( TEXTURE_FORMAT Format )
     m_pDevice->CreateTexture( TexDesc, InitData, &pSrcTex );
     m_pDevice->CreateTexture( TexDesc, TextureData(), &pDstTex );
 
-    pDstTex->CopyData(m_pContext, pSrcTex,
+    m_pContext->CopyTexture(pSrcTex,
                       2, // Src mip
                       3, // Src slice
                       nullptr, // Box
+                      pDstTex,
                       1, // dst mip
                       6, // dst slice
                       32, 16, 0 // XYZ offset 
@@ -180,10 +183,11 @@ void TestCopyTexData::Test2DTexArray( TEXTURE_FORMAT Format )
     SrcBox.MaxX = 19;
     SrcBox.MinY = 1;
     SrcBox.MaxY = 32;
-    pDstTex->CopyData(m_pContext, pSrcTex,
+    m_pContext->CopyTexture(pSrcTex,
                       2, // Src mip
                       3, // Src slice
                       &SrcBox, // Box
+                      pDstTex,
                       1, // dst mip
                       5, // dst slice
                       32, 16, 0 // XYZ offset 
@@ -217,10 +221,11 @@ void TestCopyTexData::Test3DTexture( TEXTURE_FORMAT Format )
     m_pDevice->CreateTexture( TexDesc, InitData, &pSrcTex );
     m_pDevice->CreateTexture( TexDesc, TextureData(), &pDstTex );
 
-    pDstTex->CopyData(m_pContext, pSrcTex,
+    m_pContext->CopyTexture(pSrcTex,
                       2, // Src mip
                       0, // Src slice
                       nullptr, // Box
+                      pDstTex,
                       1, // dst mip
                       0, // dst slice
                       16, 8, 0 // XYZ offset 
@@ -231,10 +236,11 @@ void TestCopyTexData::Test3DTexture( TEXTURE_FORMAT Format )
     SrcBox.MaxX = 19;
     SrcBox.MinY = 1;
     SrcBox.MaxY = 32;
-    pDstTex->CopyData(m_pContext, pSrcTex,
+    m_pContext->CopyTexture(pSrcTex,
                       1, // Src mip
                       0, // Src slice
                       &SrcBox, // Box
+                      pDstTex,
                       0, // dst mip
                       0, // dst slice
                       32, 16, 0 // XYZ offset 
diff --git a/Tests/TestApp/src/TestTextureCreation.cpp b/Tests/TestApp/src/TestTextureCreation.cpp
index cfa4afd..d0b2ef3 100644
--- a/Tests/TestApp/src/TestTextureCreation.cpp
+++ b/Tests/TestApp/src/TestTextureCreation.cpp
@@ -273,7 +273,7 @@ private:
             {
                 // In D3D11 if CopySubresourceRegion is used with Multisampled or D3D11_BIND_DEPTH_STENCIL Resources, 
                 // then the whole Subresource must be copied.
-                pTestTex->CopyData(m_pDeviceContext, pTestTex2, 0, 0, nullptr, 0, 0, 0,0,0);
+                m_pDeviceContext->CopyTexture(pTestTex2, 0, 0, nullptr, pTestTex, 0, 0, 0,0,0);
             }
             else
             {
@@ -285,7 +285,7 @@ private:
                 SrcBox.MaxY = std::max(TexDesc.Height/3, SrcBox.MinY+1);
                 SrcBox.MaxZ = ( TexDesc.Type == RESOURCE_DIM_TEX_3D ) ? std::max(TexDesc.Depth/3, SrcBox.MinZ+1) : 1;
                 //pTestTex2->UpdateData(m_pDeviceContext, 0, 0, DstBox, SubResources[0]);
-                pTestTex->CopyData(m_pDeviceContext, pTestTex2, 0, 0, &SrcBox, 0, 0, 0,0,0);
+                m_pDeviceContext->CopyTexture(pTestTex2, 0, 0, &SrcBox, pTestTex, 0, 0, 0,0,0);
             }
         }