Replaced reference to initial data parameter with pointer in CreateTexture and CreateBuffer methods; updated light scattering implementation to not use lua

13 files changed, 83 insertions, 81 deletions

diff --git a/Tests/TestApp/src/MTResourceCreationTest.cpp b/Tests/TestApp/src/MTResourceCreationTest.cpp
index 9f7f4fa..eab0888 100644
--- a/Tests/TestApp/src/MTResourceCreationTest.cpp
+++ b/Tests/TestApp/src/MTResourceCreationTest.cpp
@@ -112,12 +112,12 @@ void MTResourceCreationTest::ThreadWorkerFunc(bool bIsMasterThread)
             BuffData.DataSize = BuffDesc.uiSizeInBytes;
             BuffData.pData = RawBufferData;
 
-            m_pDevice->CreateBuffer(BuffDesc, BuffData, &pBuffer1);
+            m_pDevice->CreateBuffer(BuffDesc, &BuffData, &pBuffer1);
 
             BuffDesc.Mode = BUFFER_MODE_FORMATTED;
             BuffDesc.ElementByteStride = 16;
             BuffDesc.BindFlags = BIND_SHADER_RESOURCE|BIND_UNORDERED_ACCESS;
-            m_pDevice->CreateBuffer(BuffDesc, BuffData, &pBuffer2);
+            m_pDevice->CreateBuffer(BuffDesc, &BuffData, &pBuffer2);
 
             BufferViewDesc ViewDesc;
             ViewDesc.ViewType = BUFFER_VIEW_SHADER_RESOURCE;
@@ -128,13 +128,13 @@ void MTResourceCreationTest::ThreadWorkerFunc(bool bIsMasterThread)
             pBuffer2->CreateView(ViewDesc, &pBufferSRV);
 
             BuffDesc.BindFlags = BIND_VERTEX_BUFFER | BIND_UNORDERED_ACCESS;
-            m_pDevice->CreateBuffer(BuffDesc, BuffData, &pBuffer3);
+            m_pDevice->CreateBuffer(BuffDesc, &BuffData, &pBuffer3);
             ViewDesc.ViewType = BUFFER_VIEW_UNORDERED_ACCESS;
             pBuffer3->CreateView(ViewDesc, &pBufferUAV);
 
             BuffDesc.Mode = BUFFER_MODE_RAW;
             BuffDesc.BindFlags = BIND_INDEX_BUFFER|BIND_UNORDERED_ACCESS;
-            m_pDevice->CreateBuffer(BuffDesc, BuffData, &pBuffer4);
+            m_pDevice->CreateBuffer(BuffDesc, &BuffData, &pBuffer4);
             
             m_NumBuffersCreated += 4;
 
@@ -175,7 +175,7 @@ void MTResourceCreationTest::ThreadWorkerFunc(bool bIsMasterThread)
             TexData.NumSubresources = 1;
             TexData.pSubResources = &SubResData;
 
-            m_pDevice->CreateTexture(TexDesc, TexData, &pTexture);
+            m_pDevice->CreateTexture(TexDesc, &TexData, &pTexture);
             ++m_NumTexturesCreated;
 
             ++m_NumThreadsCompleted;
diff --git a/Tests/TestApp/src/RenderScriptTest.cpp b/Tests/TestApp/src/RenderScriptTest.cpp
index 19b81f9..4d8175e 100644
--- a/Tests/TestApp/src/RenderScriptTest.cpp
+++ b/Tests/TestApp/src/RenderScriptTest.cpp
@@ -53,7 +53,7 @@ RenderScriptTest::RenderScriptTest( IRenderDevice *pRenderDevice, IDeviceContext
         TexDesc.Usage = USAGE_DYNAMIC;
         TexDesc.BindFlags = BIND_SHADER_RESOURCE;
         TexDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
-        pRenderDevice->CreateTexture( TexDesc, TextureData(), &pTestGlobalTexture );
+        pRenderDevice->CreateTexture( TexDesc, nullptr, &pTestGlobalTexture );
     }
 
     auto pScript = CreateRenderScriptFromFile( "LuaTest.lua", pRenderDevice, pContext, [&]( Diligent::ScriptParser *pScriptParser )
@@ -71,7 +71,7 @@ RenderScriptTest::RenderScriptTest( IRenderDevice *pRenderDevice, IDeviceContext
             BuffDesc.Usage = USAGE_DYNAMIC;
             BuffDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
             RefCntAutoPtr<IBuffer> pBuffer;
-            pRenderDevice->CreateBuffer( BuffDesc, Diligent::BufferData(), &pBuffer );
+            pRenderDevice->CreateBuffer( BuffDesc, nullptr, &pBuffer );
             pScriptParser->SetGlobalVariable( "TestGlobalBuffer", pBuffer );
         }
 
@@ -84,7 +84,7 @@ RenderScriptTest::RenderScriptTest( IRenderDevice *pRenderDevice, IDeviceContext
             BuffDesc.ElementByteStride = 16;
             BuffDesc.Mode = BUFFER_MODE_STRUCTURED;
             RefCntAutoPtr<IBuffer> pBuffer;
-            pRenderDevice->CreateBuffer( BuffDesc, Diligent::BufferData(), &pBuffer );
+            pRenderDevice->CreateBuffer( BuffDesc, nullptr, &pBuffer );
             pScriptParser->SetGlobalVariable( "TestGlobalBufferWithUAV", pBuffer );
 
             auto *pUAV = pBuffer->GetDefaultView( BUFFER_VIEW_UNORDERED_ACCESS );
diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp
index dbf4f90..7e6479c 100644
--- a/Tests/TestApp/src/TestApp.cpp
+++ b/Tests/TestApp/src/TestApp.cpp
@@ -436,7 +436,7 @@ void TestApp::InitializeRenderers()
         //Diligent::BufferData BuffData;
         //BuffData.pData = instance_offsets;
         //BuffData.DataSize = sizeof(instance_offsets);
-        m_pDevice->CreateBuffer(BuffDesc, Diligent::BufferData(), &m_pInstBuff2);
+        m_pDevice->CreateBuffer(BuffDesc, nullptr, &m_pInstBuff2);
     }
     
 
@@ -452,7 +452,7 @@ void TestApp::InitializeRenderers()
         BuffDesc.BindFlags = BIND_UNIFORM_BUFFER;
         BuffDesc.Usage = USAGE_DYNAMIC;
         BuffDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
-        m_pDevice->CreateBuffer(BuffDesc, BufferData(), &m_pUniformBuff2);
+        m_pDevice->CreateBuffer(BuffDesc, nullptr, &m_pUniformBuff2);
     }
 
     {
@@ -466,7 +466,7 @@ void TestApp::InitializeRenderers()
         Diligent::BufferData BuffData;
         BuffData.pData = UniformData;
         BuffData.DataSize = sizeof(UniformData);
-        m_pDevice->CreateBuffer(BuffDesc, BuffData, &m_pUniformBuff3);
+        m_pDevice->CreateBuffer(BuffDesc, &BuffData, &m_pUniformBuff3);
     }
 
     {
@@ -480,7 +480,7 @@ void TestApp::InitializeRenderers()
         Diligent::BufferData BuffData;
         BuffData.pData = UniformData;
         BuffData.DataSize = sizeof(UniformData);
-        m_pDevice->CreateBuffer(BuffDesc, BuffData, &m_pUniformBuff4);
+        m_pDevice->CreateBuffer(BuffDesc, &BuffData, &m_pUniformBuff4);
     }
 
     {
@@ -502,10 +502,10 @@ void TestApp::InitializeRenderers()
         TexDesc.BindFlags = BIND_SHADER_RESOURCE | BIND_RENDER_TARGET | BIND_UNORDERED_ACCESS;
         TexDesc.Name = "UniqueTexture";
 
-        m_pDevice->CreateTexture(TexDesc, TextureData(), &m_pTestTex);
+        m_pDevice->CreateTexture(TexDesc, nullptr, &m_pTestTex);
 
         m_pTestTex.Release();
-        m_pDevice->CreateTexture(TexDesc, TextureData(), &m_pTestTex);
+        m_pDevice->CreateTexture(TexDesc, nullptr, &m_pTestTex);
     }
 
     {
@@ -520,13 +520,13 @@ void TestApp::InitializeRenderers()
         TexDesc.BindFlags = BIND_SHADER_RESOURCE | BIND_RENDER_TARGET;
         TexDesc.Name = "UniqueTexture";
         RefCntAutoPtr<ITexture> pTex;
-        m_pDevice->CreateTexture(TexDesc, TextureData(), &pTex);
+        m_pDevice->CreateTexture(TexDesc, nullptr, &pTex);
         ITextureView *pRTVs[] = { pTex->GetDefaultView(TEXTURE_VIEW_RENDER_TARGET) };
 
         TexDesc.Format = m_pSwapChain->GetDesc().DepthBufferFormat;
         RefCntAutoPtr<ITexture> pDepthTex;
         TexDesc.BindFlags = BIND_DEPTH_STENCIL;
-        m_pDevice->CreateTexture(TexDesc, TextureData(), &pDepthTex);
+        m_pDevice->CreateTexture(TexDesc, nullptr, &pDepthTex);
         auto* pDSV = pDepthTex->GetDefaultView(TEXTURE_VIEW_DEPTH_STENCIL);
 
         {
@@ -573,7 +573,7 @@ void TestApp::InitializeRenderers()
         BuffData.DataSize = sizeof(Data);
         // This will result in creating and executing another command list
         RefCntAutoPtr<IBuffer> pBuff;
-        m_pDevice->CreateBuffer(BuffDesc, BuffData, &pBuff);
+        m_pDevice->CreateBuffer(BuffDesc, &BuffData, &pBuff);
 
         // This may cause D3D12 error
         m_pImmediateContext->Flush();
diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp
index b3aab3a..712c2e3 100644
--- a/Tests/TestApp/src/TestBufferAccess.cpp
+++ b/Tests/TestApp/src/TestBufferAccess.cpp
@@ -64,7 +64,7 @@ void TestBufferAccess::Init( IRenderDevice *pDevice, IDeviceContext *pContext, I
         Diligent::BufferData BuffData;
         BuffData.pData = vertices;
         BuffData.DataSize = BuffDesc.uiSizeInBytes;
-        m_pRenderDevice->CreateBuffer(BuffDesc, BuffData, &m_pVertexBuff);
+        m_pRenderDevice->CreateBuffer(BuffDesc, &BuffData, &m_pVertexBuff);
     }
 
     for(int InstBuff = 0; InstBuff < _countof(m_pInstBuff); ++InstBuff)
@@ -109,7 +109,7 @@ void TestBufferAccess::Init( IRenderDevice *pDevice, IDeviceContext *pContext, I
             BuffData.pData = instance_offsets;
             BuffData.DataSize = sizeof(instance_offsets);
         }
-        m_pRenderDevice->CreateBuffer(BuffDesc, BuffData, &m_pInstBuff[InstBuff]);
+        m_pRenderDevice->CreateBuffer(BuffDesc, &BuffData, &m_pInstBuff[InstBuff]);
     }
 
     ShaderCreationAttribs CreationAttrs;
@@ -147,9 +147,9 @@ void TestBufferAccess::Init( IRenderDevice *pDevice, IDeviceContext *pContext, I
 
     LayoutElement Elems[] =
     {
-        LayoutElement( 0, 1, 3, Diligent::VT_FLOAT32, false, 0 ),
-        LayoutElement( 1, 1, 3, Diligent::VT_FLOAT32, false, sizeof( float ) * 3, sizeof( float ) * 6),
-        LayoutElement( 2, 3, 2, Diligent::VT_FLOAT32, false, 0, 0, LayoutElement::FREQUENCY_PER_INSTANCE )
+        LayoutElement{ 0, 1, 3, Diligent::VT_FLOAT32, false, 0 },
+        LayoutElement{ 1, 1, 3, Diligent::VT_FLOAT32, false, sizeof( float ) * 3, sizeof( float ) * 6   },
+        LayoutElement{ 2, 3, 2, Diligent::VT_FLOAT32, false, 0, 0, LayoutElement::FREQUENCY_PER_INSTANCE }
     };
     PSODesc.GraphicsPipeline.InputLayout.LayoutElements = Elems;
     PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof( Elems );
diff --git a/Tests/TestApp/src/TestBufferCreation.cpp b/Tests/TestApp/src/TestBufferCreation.cpp
index 82f2529..69c0e7d 100644
--- a/Tests/TestApp/src/TestBufferCreation.cpp
+++ b/Tests/TestApp/src/TestBufferCreation.cpp
@@ -89,7 +89,7 @@ TestBufferCreation::TestBufferCreation(Diligent::IRenderDevice *pDevice, Diligen
         InitData.DataSize = BuffDesc.uiSizeInBytes;
         std::vector<Uint8> DummyData(InitData.DataSize);
         InitData.pData = DummyData.data();
-        pDevice->CreateBuffer(BuffDesc, InitData, &pBuffer);
+        pDevice->CreateBuffer(BuffDesc, &InitData, &pBuffer);
         VERIFY_EXPR(pBuffer);
 
         pTestCreateObjFromNativeRes->CreateBuffer(pBuffer);
@@ -102,7 +102,8 @@ TestBufferCreation::TestBufferCreation(Diligent::IRenderDevice *pDevice, Diligen
         BuffDesc.uiSizeInBytes = 256;
         BuffDesc.BindFlags = BIND_VERTEX_BUFFER;
         RefCntAutoPtr<IBuffer> pBuffer;
-        pDevice->CreateBuffer(BuffDesc, BufferData(), &pBuffer);
+        BufferData NullData;
+        pDevice->CreateBuffer(BuffDesc, &NullData, &pBuffer);
         VERIFY_EXPR(pBuffer);
 
         pTestCreateObjFromNativeRes->CreateBuffer(pBuffer);
@@ -118,7 +119,7 @@ TestBufferCreation::TestBufferCreation(Diligent::IRenderDevice *pDevice, Diligen
         BuffDesc.Mode = BUFFER_MODE_FORMATTED;
         BuffDesc.ElementByteStride = 16;
         RefCntAutoPtr<IBuffer> pBuffer;
-        pDevice->CreateBuffer(BuffDesc, BufferData(), &pBuffer);
+        pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer);
         VERIFY_EXPR(pBuffer);
 
         BufferViewDesc ViewDesc;
@@ -147,7 +148,7 @@ TestBufferCreation::TestBufferCreation(Diligent::IRenderDevice *pDevice, Diligen
         BuffDesc.Mode = BUFFER_MODE_STRUCTURED;
         BuffDesc.ElementByteStride = 16;
         RefCntAutoPtr<IBuffer> pBuffer;
-        pDevice->CreateBuffer(BuffDesc, BufferData(), &pBuffer);
+        pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer);
         VERIFY_EXPR(pBuffer);
 
         pTestCreateObjFromNativeRes->CreateBuffer(pBuffer);
@@ -160,7 +161,7 @@ TestBufferCreation::TestBufferCreation(Diligent::IRenderDevice *pDevice, Diligen
         BuffDesc.uiSizeInBytes = 256;
         BuffDesc.BindFlags =  BIND_UNIFORM_BUFFER;
         RefCntAutoPtr<IBuffer> pBuffer;
-        pDevice->CreateBuffer(BuffDesc, BufferData(), &pBuffer);
+        pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer);
         VERIFY_EXPR(pBuffer);
 
         pTestCreateObjFromNativeRes->CreateBuffer(pBuffer);
@@ -175,7 +176,7 @@ TestBufferCreation::TestBufferCreation(Diligent::IRenderDevice *pDevice, Diligen
         BuffDesc.Mode = BUFFER_MODE_RAW;
         BuffDesc.ElementByteStride = 16;
         RefCntAutoPtr<IBuffer> pBuffer;
-        pDevice->CreateBuffer(BuffDesc, BufferData(), &pBuffer);
+        pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer);
         VERIFY_EXPR(pBuffer);
 
         BufferViewDesc ViewDesc;
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;
diff --git a/Tests/TestApp/src/TestDrawCommands.cpp b/Tests/TestApp/src/TestDrawCommands.cpp
index d45b3b9..a0a4c24 100644
--- a/Tests/TestApp/src/TestDrawCommands.cpp
+++ b/Tests/TestApp/src/TestDrawCommands.cpp
@@ -76,7 +76,7 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         BufferData BuffData;
         BuffData.pData = VertexData.data();
         BuffData.DataSize = (Uint32)VertexData.size()*sizeof( float );
-        m_pRenderDevice->CreateBuffer( BuffDesc, BuffData, &m_pVertexBuff );
+        m_pRenderDevice->CreateBuffer( BuffDesc, &BuffData, &m_pVertexBuff );
     }
 
     {
@@ -88,7 +88,7 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         BufferData BuffData;
         BuffData.pData = VertexData2.data();
         BuffData.DataSize = (Uint32)VertexData2.size()*sizeof( float );
-        m_pRenderDevice->CreateBuffer( BuffDesc, BuffData, &m_pVertexBuff2 );
+        m_pRenderDevice->CreateBuffer( BuffDesc, &BuffData, &m_pVertexBuff2 );
     }
 
     {
@@ -100,7 +100,7 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         BufferData BuffData;
         BuffData.pData = IndexData.data();
         BuffData.DataSize = BuffDesc.uiSizeInBytes;
-        m_pRenderDevice->CreateBuffer( BuffDesc, BuffData, &m_pIndexBuff );
+        m_pRenderDevice->CreateBuffer( BuffDesc, &BuffData, &m_pIndexBuff );
     }
 
     {
@@ -112,7 +112,7 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         BufferData BuffData;
         BuffData.pData = InstanceData.data();
         BuffData.DataSize = BuffDesc.uiSizeInBytes;
-        m_pRenderDevice->CreateBuffer( BuffDesc, BuffData, &m_pInstanceData );
+        m_pRenderDevice->CreateBuffer( BuffDesc, &BuffData, &m_pInstanceData );
     }
 
     if( m_pRenderDevice->GetDeviceCaps().bIndirectRenderingSupported )
@@ -132,7 +132,7 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         BuffDesc.BindFlags = BIND_INDIRECT_DRAW_ARGS | BIND_VERTEX_BUFFER;
         BuffDesc.Usage = USAGE_DYNAMIC;
         BuffDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
-        m_pRenderDevice->CreateBuffer( BuffDesc, BufferData(), &m_pIndirectDrawArgs );
+        m_pRenderDevice->CreateBuffer( BuffDesc, nullptr, &m_pIndirectDrawArgs );
     }
 
     {
@@ -152,7 +152,7 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         BuffDesc.BindFlags = BIND_INDIRECT_DRAW_ARGS | BIND_VERTEX_BUFFER;
         BuffDesc.Usage = USAGE_DYNAMIC;
         BuffDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
-        m_pRenderDevice->CreateBuffer( BuffDesc, BufferData(), &m_pIndexedIndirectDrawArgs );
+        m_pRenderDevice->CreateBuffer( BuffDesc, nullptr, &m_pIndexedIndirectDrawArgs );
     }
 
 
@@ -208,8 +208,8 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         InputLayoutDesc LayoutDesc;
         LayoutElement Elems[] =
         {
-            LayoutElement( 0, 0, 3, VT_FLOAT32, false, 0 ),
-            LayoutElement( 1, 0, 3, VT_FLOAT32, false, sizeof( float ) * 3 )
+            LayoutElement{ 0, 0, 3, VT_FLOAT32, false, 0 },
+            LayoutElement{ 1, 0, 3, VT_FLOAT32, false, sizeof( float ) * 3 }
         };
         PSODesc.GraphicsPipeline.InputLayout.LayoutElements = Elems;
         PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof( Elems );
@@ -225,9 +225,9 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         InputLayoutDesc LayoutDesc;
         LayoutElement Elems[] =
         {
-            LayoutElement( 0, 0, 3, VT_FLOAT32, false, 0 ),
-            LayoutElement( 1, 0, 3, VT_FLOAT32, false, sizeof( float ) * 3 ),
-            LayoutElement( 2, 1, 2, VT_FLOAT32, false, 0, 0, LayoutElement::FREQUENCY_PER_INSTANCE )
+            LayoutElement{ 0, 0, 3, VT_FLOAT32, false, 0 },
+            LayoutElement{ 1, 0, 3, VT_FLOAT32, false, sizeof( float ) * 3 },
+            LayoutElement{ 2, 1, 2, VT_FLOAT32, false, 0, 0, LayoutElement::FREQUENCY_PER_INSTANCE }
         };
         PSODesc.GraphicsPipeline.InputLayout.LayoutElements = Elems;
         PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof( Elems );
@@ -246,9 +246,9 @@ void TestDrawCommands::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceCont
         BuffData.DataSize = sizeof( UniformData );
         RefCntAutoPtr<IBuffer> pUniformBuff3, pUniformBuff4;
         BuffDesc.Name = "Test Constant Buffer 3";
-        m_pRenderDevice->CreateBuffer( BuffDesc, BuffData, &pUniformBuff3 );
+        m_pRenderDevice->CreateBuffer( BuffDesc, &BuffData, &pUniformBuff3 );
         BuffDesc.Name = "Test Constant Buffer 4";
-        m_pRenderDevice->CreateBuffer( BuffDesc, BuffData, &pUniformBuff4 );
+        m_pRenderDevice->CreateBuffer( BuffDesc, &BuffData, &pUniformBuff4 );
 
         ResourceMappingDesc ResMappingDesc;
         ResourceMappingEntry pEtries[] = { { "cbTestBlock3", pUniformBuff3 }, { "cbTestBlock4", pUniformBuff4 }, { nullptr, nullptr } };
diff --git a/Tests/TestApp/src/TestSeparateTextureSampler.cpp b/Tests/TestApp/src/TestSeparateTextureSampler.cpp
index ab55c94..26f48ef 100644
--- a/Tests/TestApp/src/TestSeparateTextureSampler.cpp
+++ b/Tests/TestApp/src/TestSeparateTextureSampler.cpp
@@ -114,7 +114,7 @@ TestSeparateTextureSampler::TestSeparateTextureSampler(IRenderDevice *pDevice, I
         TexDesc.Usage = USAGE_DEFAULT;
         TexDesc.BindFlags = BIND_SHADER_RESOURCE;
         RefCntAutoPtr<ITexture> pTexture;
-        pDevice->CreateTexture( TexDesc, TextureData(), &pTexture );
+        pDevice->CreateTexture( TexDesc, nullptr, &pTexture );
 
         RefCntAutoPtr<ISampler> pSampler;
         pDevice->CreateSampler( SamplerDesc{}, &pSampler );
@@ -148,7 +148,7 @@ TestSeparateTextureSampler::TestSeparateTextureSampler(IRenderDevice *pDevice, I
         RenderTargetDesc.Format = TEX_FORMAT_RGBA8_UNORM;
         RenderTargetDesc.Name = "TestSeparateTextureSampler: test render target";
         RefCntAutoPtr<ITexture> pRenderTarget;
-        pDevice->CreateTexture(RenderTargetDesc, TextureData{}, &pRenderTarget);
+        pDevice->CreateTexture(RenderTargetDesc, nullptr, &pRenderTarget);
 
         ITextureView* pRTV[] = {pRenderTarget->GetDefaultView(TEXTURE_VIEW_RENDER_TARGET)};
         pContext->SetRenderTargets(1, pRTV, nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
diff --git a/Tests/TestApp/src/TestShaderResArrays.cpp b/Tests/TestApp/src/TestShaderResArrays.cpp
index 2b193d7..9481315 100644
--- a/Tests/TestApp/src/TestShaderResArrays.cpp
+++ b/Tests/TestApp/src/TestShaderResArrays.cpp
@@ -92,8 +92,8 @@ TestShaderResArrays::TestShaderResArrays(IRenderDevice *pDevice, IDeviceContext
     PSODesc.GraphicsPipeline.PrimitiveTopology = PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
     LayoutElement Elems[] =
     {
-        LayoutElement( 0, 0, 3, Diligent::VT_FLOAT32, false, 0 ),
-        LayoutElement( 1, 0, 2, Diligent::VT_FLOAT32, false, sizeof( float ) * 3 )
+        LayoutElement{ 0, 0, 3, Diligent::VT_FLOAT32, false, 0 },
+        LayoutElement{ 1, 0, 2, Diligent::VT_FLOAT32, false, sizeof( float ) * 3 }
     };
     PSODesc.GraphicsPipeline.InputLayout.LayoutElements = Elems;
     PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof( Elems );
@@ -121,7 +121,7 @@ TestShaderResArrays::TestShaderResArrays(IRenderDevice *pDevice, IDeviceContext
         Diligent::BufferData BuffData;
         BuffData.pData = Vertices;
         BuffData.DataSize = BuffDesc.uiSizeInBytes;
-        m_pRenderDevice->CreateBuffer(BuffDesc, BuffData, &m_pVertexBuff);
+        m_pRenderDevice->CreateBuffer(BuffDesc, &BuffData, &m_pVertexBuff);
     }
 
     RefCntAutoPtr<ISampler> pSampler;
@@ -147,7 +147,7 @@ TestShaderResArrays::TestShaderResArrays(IRenderDevice *pDevice, IDeviceContext
         TexData.pSubResources = SubResouces.data();
         TexData.NumSubresources = (Uint32)SubResouces.size();
 
-        m_pRenderDevice->CreateTexture( TexDesc, TexData, &m_pTextures[t] );
+        m_pRenderDevice->CreateTexture( TexDesc, &TexData, &m_pTextures[t] );
         m_pTextures[t]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE)->SetSampler(pSampler);
     }
 
diff --git a/Tests/TestApp/src/TestShaderResourceLayout.cpp b/Tests/TestApp/src/TestShaderResourceLayout.cpp
index a05432a..b0bf1e3 100644
--- a/Tests/TestApp/src/TestShaderResourceLayout.cpp
+++ b/Tests/TestApp/src/TestShaderResourceLayout.cpp
@@ -65,7 +65,7 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev
     IDeviceObject *pSRVs[4];
     for(int i=0; i < 4; ++i)
     {
-        pDevice->CreateTexture(TexDesc, TextureData{}, &(pTex[i]));
+        pDevice->CreateTexture(TexDesc, nullptr, &(pTex[i]));
         auto *pSRV = pTex[i]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE);
         pSRV->SetSampler(pSamplers[i]);
         pSRVs[i] = pSRV;
@@ -77,13 +77,13 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev
     IDeviceObject *pUAVs[4];
     for (int i = 0; i < 4; ++i)
     {
-        pDevice->CreateTexture(TexDesc, TextureData{}, &(pStorageTex[i]));
+        pDevice->CreateTexture(TexDesc, nullptr, &(pStorageTex[i]));
         pUAVs[i] = pStorageTex[i]->GetDefaultView(TEXTURE_VIEW_UNORDERED_ACCESS);
     }
 
     TexDesc.BindFlags = BIND_RENDER_TARGET;
     RefCntAutoPtr<ITexture> pRenderTarget;
-    pDevice->CreateTexture(TexDesc, TextureData{}, &pRenderTarget);
+    pDevice->CreateTexture(TexDesc, nullptr, &pRenderTarget);
     auto *pRTV = pRenderTarget->GetDefaultView(TEXTURE_VIEW_RENDER_TARGET);
     m_pDeviceContext->SetRenderTargets(1, &pRTV, nullptr, RESOURCE_STATE_TRANSITION_MODE_TRANSITION);
     float Zero[4] = {};
@@ -96,7 +96,7 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev
     IDeviceObject *pUBs[4];
     for (int i = 0; i < 4; ++i)
     {
-        pDevice->CreateBuffer(BuffDesc, BufferData{}, &(pUniformBuffs[i]));
+        pDevice->CreateBuffer(BuffDesc, nullptr, &(pUniformBuffs[i]));
         pUBs[i] = pUniformBuffs[i];
     }
 
@@ -107,7 +107,7 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev
     IDeviceObject *pSBUAVs[4];
     for (int i = 0; i < 4; ++i)
     {
-        pDevice->CreateBuffer(BuffDesc, BufferData{}, &(pStorgeBuffs[i]));
+        pDevice->CreateBuffer(BuffDesc, nullptr, &(pStorgeBuffs[i]));
         pSBUAVs[i] = pStorgeBuffs[i]->GetDefaultView(BUFFER_VIEW_UNORDERED_ACCESS);
     }
 
@@ -121,7 +121,7 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev
         TxlBuffDesc.Usage = USAGE_DEFAULT;
         TxlBuffDesc.ElementByteStride = 16;
         TxlBuffDesc.Mode = BUFFER_MODE_FORMATTED;
-        pDevice->CreateBuffer(TxlBuffDesc, BufferData{}, &pUniformTexelBuff);
+        pDevice->CreateBuffer(TxlBuffDesc, nullptr, &pUniformTexelBuff);
 
         BufferViewDesc TxlBuffViewDesc;
         TxlBuffViewDesc.Name = "Uniform texel buffer SRV";
@@ -133,7 +133,7 @@ TestShaderResourceLayout::TestShaderResourceLayout( IRenderDevice *pDevice, IDev
 
         TxlBuffDesc.Name = "Storage texel buffer test";
         TxlBuffDesc.BindFlags = BIND_UNORDERED_ACCESS;
-        pDevice->CreateBuffer(TxlBuffDesc, BufferData{}, &pStorageTexelBuff);
+        pDevice->CreateBuffer(TxlBuffDesc, nullptr, &pStorageTexelBuff);
         
         TxlBuffViewDesc.Name = "Storage texel buffer UAV";
         TxlBuffViewDesc.ViewType = BUFFER_VIEW_UNORDERED_ACCESS;
diff --git a/Tests/TestApp/src/TestShaderVarAccess.cpp b/Tests/TestApp/src/TestShaderVarAccess.cpp
index d65ba10..3d30a26 100644
--- a/Tests/TestApp/src/TestShaderVarAccess.cpp
+++ b/Tests/TestApp/src/TestShaderVarAccess.cpp
@@ -62,7 +62,7 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext
     IDeviceObject *pSRVs[2];
     for(size_t i=0; i < _countof(pSRVs); ++i)
     {
-        pDevice->CreateTexture(TexDesc, TextureData{}, &(pTex[i]));
+        pDevice->CreateTexture(TexDesc, nullptr, &(pTex[i]));
         auto *pSRV = pTex[i]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE);
         pSRV->SetSampler(pSamplers[i]);
         pSRVs[i] = pSRV;
@@ -75,7 +75,7 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext
     TexDesc.Format = TEX_FORMAT_RGBA32_FLOAT;
     for(size_t i=0; i < _countof(pRWTex); ++i)
     {
-        pDevice->CreateTexture(TexDesc, TextureData{}, &(pRWTex[i]));
+        pDevice->CreateTexture(TexDesc, nullptr, &(pRWTex[i]));
         pTexUAVs[i] = pRWTex[i]->GetDefaultView(TEXTURE_VIEW_UNORDERED_ACCESS);
         pRWTexSRVs[i] = pRWTex[i]->GetDefaultView(TEXTURE_VIEW_SHADER_RESOURCE);
     }
@@ -92,13 +92,13 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext
     TexDesc.Format = pSwapChain->GetDesc().ColorBufferFormat;
     TexDesc.BindFlags = BIND_RENDER_TARGET | BIND_SHADER_RESOURCE;
     RefCntAutoPtr<ITexture> pRenderTarget;
-    pDevice->CreateTexture(TexDesc, TextureData{}, &pRenderTarget);
+    pDevice->CreateTexture(TexDesc, nullptr, &pRenderTarget);
     auto *pRTV = pRenderTarget->GetDefaultView(TEXTURE_VIEW_RENDER_TARGET);
 
     TexDesc.Format = pSwapChain->GetDesc().DepthBufferFormat;
     TexDesc.BindFlags = BIND_DEPTH_STENCIL;
     RefCntAutoPtr<ITexture> pDepthTex;
-    pDevice->CreateTexture(TexDesc, TextureData{}, &pDepthTex);
+    pDevice->CreateTexture(TexDesc, nullptr, &pDepthTex);
     auto *pDSV = pDepthTex->GetDefaultView(TEXTURE_VIEW_DEPTH_STENCIL);
 
     BufferDesc BuffDesc;
@@ -108,7 +108,7 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext
     IDeviceObject *pUBs[2];
     for (int i = 0; i < _countof(pUniformBuffs); ++i)
     {
-        pDevice->CreateBuffer(BuffDesc, BufferData{}, &(pUniformBuffs[i]));
+        pDevice->CreateBuffer(BuffDesc, nullptr, &(pUniformBuffs[i]));
         pUBs[i] = pUniformBuffs[i];
     }
 
@@ -135,7 +135,7 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext
         TxlBuffDesc.Usage = USAGE_DEFAULT;
         TxlBuffDesc.ElementByteStride = 16;
         TxlBuffDesc.Mode = BUFFER_MODE_FORMATTED;
-        pDevice->CreateBuffer(TxlBuffDesc, BufferData{}, &pFormattedBuff0);
+        pDevice->CreateBuffer(TxlBuffDesc, nullptr, &pFormattedBuff0);
         
         Diligent::BufferViewDesc ViewDesc;
         ViewDesc.ViewType = BUFFER_VIEW_SHADER_RESOURCE;
@@ -149,7 +149,7 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext
         {
             TxlBuffDesc.Name = "UAV buffer test";
             TxlBuffDesc.BindFlags = BIND_SHADER_RESOURCE | BIND_UNORDERED_ACCESS;
-            pDevice->CreateBuffer(TxlBuffDesc, BufferData{}, &(pFormattedBuff[i]));
+            pDevice->CreateBuffer(TxlBuffDesc, nullptr, &(pFormattedBuff[i]));
             
             ViewDesc.ViewType = BUFFER_VIEW_UNORDERED_ACCESS;
             pFormattedBuff[i]->CreateView(ViewDesc, &(spFormattedBuffUAV[i]));
@@ -165,7 +165,7 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext
         for(size_t i=0; i < _countof(pRawBuff); ++i)
         {
             TxlBuffDesc.Name = "Raw buffer test";
-            pDevice->CreateBuffer(TxlBuffDesc, BufferData{}, &(pRawBuff[i]));
+            pDevice->CreateBuffer(TxlBuffDesc, nullptr, &(pRawBuff[i]));
             spRawBuffUAV[i]  = pRawBuff[i]->GetDefaultView(BUFFER_VIEW_UNORDERED_ACCESS);
             spRawBuffSRVs[i] = pRawBuff[i]->GetDefaultView(BUFFER_VIEW_SHADER_RESOURCE);
         }
@@ -264,10 +264,10 @@ TestShaderVarAccess::TestShaderVarAccess( IRenderDevice *pDevice, IDeviceContext
         }
     }
 
-    VarDesc.emplace_back( "g_rwtex2D_Mut", SHADER_VARIABLE_TYPE_MUTABLE );
-    VarDesc.emplace_back( "g_rwtex2D_Dyn", SHADER_VARIABLE_TYPE_DYNAMIC );
-    VarDesc.emplace_back( "g_rwBuff_Mut", SHADER_VARIABLE_TYPE_MUTABLE );
-    VarDesc.emplace_back( "g_rwBuff_Dyn", SHADER_VARIABLE_TYPE_DYNAMIC );
+    VarDesc.emplace_back( ShaderVariableDesc{"g_rwtex2D_Mut", SHADER_VARIABLE_TYPE_MUTABLE} );
+    VarDesc.emplace_back( ShaderVariableDesc{"g_rwtex2D_Dyn", SHADER_VARIABLE_TYPE_DYNAMIC} );
+    VarDesc.emplace_back( ShaderVariableDesc{"g_rwBuff_Mut", SHADER_VARIABLE_TYPE_MUTABLE} );
+    VarDesc.emplace_back( ShaderVariableDesc{"g_rwBuff_Dyn", SHADER_VARIABLE_TYPE_DYNAMIC} );
 
     RefCntAutoPtr<IShader> pPS;
     {
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);
         }
 
diff --git a/Tests/TestApp/src/TestTexturing.cpp b/Tests/TestApp/src/TestTexturing.cpp
index 8109c40..adbcbc3 100644
--- a/Tests/TestApp/src/TestTexturing.cpp
+++ b/Tests/TestApp/src/TestTexturing.cpp
@@ -161,7 +161,7 @@ void TestTexturing::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceContext
         Diligent::BufferData BuffData;
         BuffData.pData = Vertices;
         BuffData.DataSize = BuffDesc.uiSizeInBytes;
-        m_pRenderDevice->CreateBuffer(BuffDesc, BuffData, &m_pVertexBuff);
+        m_pRenderDevice->CreateBuffer(BuffDesc, &BuffData, &m_pVertexBuff);
     }
     
     auto PixelFormatAttribs = m_pRenderDevice->GetTextureFormatInfoExt(m_TextureFormat);
@@ -234,7 +234,7 @@ void TestTexturing::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceContext
         TexData.pSubResources = SubResouces.data();
         TexData.NumSubresources = (Uint32)SubResouces.size();
 
-        m_pRenderDevice->CreateTexture( TexDesc, TexData, &m_pTexture );
+        m_pRenderDevice->CreateTexture( TexDesc, &TexData, &m_pTexture );
     }
     
     {
@@ -264,8 +264,8 @@ void TestTexturing::Init( IRenderDevice *pDevice, IDeviceContext *pDeviceContext
 
     LayoutElement Elems[] =
     {
-        LayoutElement( 0, 0, 3, Diligent::VT_FLOAT32, false, 0 ),
-        LayoutElement( 1, 0, 2, Diligent::VT_FLOAT32, false, sizeof( float ) * 3 )
+        LayoutElement{ 0, 0, 3, Diligent::VT_FLOAT32, false, 0 },
+        LayoutElement{ 1, 0, 2, Diligent::VT_FLOAT32, false, sizeof( float ) * 3 }
     };
     PSODesc.GraphicsPipeline.InputLayout.LayoutElements = Elems;
     PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof( Elems );