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/TestTextureCreation.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/TestTextureCreation.cpp')
| -rw-r--r-- | Tests/TestApp/src/TestTextureCreation.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Tests/TestApp/src/TestTextureCreation.cpp b/Tests/TestApp/src/TestTextureCreation.cpp index b95765c..72a7ccd 100644 --- a/Tests/TestApp/src/TestTextureCreation.cpp +++ b/Tests/TestApp/src/TestTextureCreation.cpp @@ -252,7 +252,8 @@ private: TexDesc.SampleCount = SampleCount; RefCntAutoPtr<Diligent::ITexture> pTestTex; - m_pDevice->CreateTexture( TexDesc, TextureData(), &pTestTex ); + TextureData NullData; + m_pDevice->CreateTexture( TexDesc, &NullData, &pTestTex ); m_pTestCreateObjFromNativeRes->CreateTexture(pTestTex); TexDesc.MipLevels = pTestTex->GetDesc().MipLevels; if( SampleCount == 1 && m_bTestDataUpload ) @@ -265,7 +266,7 @@ private: TexDesc.Name = "TestTexture2"; RefCntAutoPtr<Diligent::ITexture> pTestTex2; - m_pDevice->CreateTexture( TexDesc, InitData, &pTestTex2 ); + m_pDevice->CreateTexture( TexDesc, &InitData, &pTestTex2 ); m_pTestCreateObjFromNativeRes->CreateTexture(pTestTex2); if(m_pDevice->GetDeviceCaps().DevType == DeviceType::D3D11 && @@ -401,7 +402,7 @@ private: TexDesc.SampleCount = 1; RefCntAutoPtr<Diligent::ITexture> pTestCubemap, pTestCubemapArr; - m_pDevice->CreateTexture( TexDesc, TextureData(), &pTestCubemap ); + m_pDevice->CreateTexture( TexDesc, nullptr, &pTestCubemap ); m_pTestCreateObjFromNativeRes->CreateTexture(pTestCubemap); TexDesc.MipLevels = pTestCubemap->GetDesc().MipLevels; @@ -417,7 +418,7 @@ private: InitData.pSubResources = SubResources.data(); TexDesc.Name = "TestCubemap2"; pTestCubemap.Release(); - m_pDevice->CreateTexture( TexDesc, InitData, &pTestCubemap ); + m_pDevice->CreateTexture( TexDesc, &InitData, &pTestCubemap ); m_pTestCreateObjFromNativeRes->CreateTexture(pTestCubemap); } @@ -547,7 +548,7 @@ private: TexDesc.Name = "TestCubemapArray"; - m_pDevice->CreateTexture( TexDesc, InitData, &pTestCubemapArr ); + m_pDevice->CreateTexture( TexDesc, &InitData, &pTestCubemapArr ); m_pTestCreateObjFromNativeRes->CreateTexture(pTestCubemapArr); } |
