diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-02-09 23:06:00 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-02-09 23:06:00 +0000 |
| commit | 3c8fa483a325ff3f82ba23c5fc24c7a731761d17 (patch) | |
| tree | 17c541d746e474831bc923ddcb9aca7afa42e5ad /Tests/TestApp/src/TestCopyTexData.cpp | |
| parent | Updated core (fixed dynamic heap master block counting issue). (diff) | |
| download | DiligentEngine-3c8fa483a325ff3f82ba23c5fc24c7a731761d17.tar.gz DiligentEngine-3c8fa483a325ff3f82ba23c5fc24c7a731761d17.zip | |
Replaced reference to initial data parameter with pointer in CreateTexture and CreateBuffer methods; updated light scattering implementation to not use lua
Diffstat (limited to 'Tests/TestApp/src/TestCopyTexData.cpp')
| -rw-r--r-- | Tests/TestApp/src/TestCopyTexData.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Tests/TestApp/src/TestCopyTexData.cpp b/Tests/TestApp/src/TestCopyTexData.cpp index 603530f..c4152f9 100644 --- a/Tests/TestApp/src/TestCopyTexData.cpp +++ b/Tests/TestApp/src/TestCopyTexData.cpp @@ -105,8 +105,8 @@ void TestCopyTexData::Test2DTexture( TEXTURE_FORMAT Format ) SubResData[mip] = TextureSubResData{DummyData.data(), (TexDesc.Width >> mip) * TexelSize, 0}; } InitData.pSubResources = SubResData.data(); - m_pDevice->CreateTexture( TexDesc, InitData, &pSrcTex ); - m_pDevice->CreateTexture( TexDesc, TextureData(), &pDstTex ); + m_pDevice->CreateTexture( TexDesc, &InitData, &pSrcTex ); + m_pDevice->CreateTexture( TexDesc, nullptr, &pDstTex ); CopyTextureAttribs CopyAttribs; CopyAttribs.pSrcTexture = pSrcTex; @@ -161,8 +161,8 @@ void TestCopyTexData::Test2DTexArray( TEXTURE_FORMAT Format ) VERIFY_EXPR(subres == InitData.NumSubresources); InitData.pSubResources = SubResData.data(); - m_pDevice->CreateTexture( TexDesc, InitData, &pSrcTex ); - m_pDevice->CreateTexture( TexDesc, TextureData(), &pDstTex ); + m_pDevice->CreateTexture( TexDesc, &InitData, &pSrcTex ); + m_pDevice->CreateTexture( TexDesc, nullptr, &pDstTex ); CopyTextureAttribs CopyAttribs; CopyAttribs.pSrcTexture = pSrcTex; @@ -214,8 +214,8 @@ void TestCopyTexData::Test3DTexture( TEXTURE_FORMAT Format ) SubResData[mip] = TextureSubResData{DummyData.data(), (TexDesc.Width >> mip) * TexelSize, (TexDesc.Width >> mip) * (TexDesc.Height >> mip) * TexelSize}; } InitData.pSubResources = SubResData.data(); - m_pDevice->CreateTexture( TexDesc, InitData, &pSrcTex ); - m_pDevice->CreateTexture( TexDesc, TextureData(), &pDstTex ); + m_pDevice->CreateTexture( TexDesc, &InitData, &pSrcTex ); + m_pDevice->CreateTexture( TexDesc, nullptr, &pDstTex ); CopyTextureAttribs CopyAttribs; CopyAttribs.pSrcTexture = pSrcTex; |