diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-02-09 01:34:03 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-02-09 01:34:03 +0000 |
| commit | 7f903f32d1dfc48176dad10b67766d9032a0675e (patch) | |
| tree | df4d41b3d4c9af9e0163da43d3467301882cb75b /TextureLoader/src | |
| parent | Improved handling unordered_maps (diff) | |
| download | DiligentTools-7f903f32d1dfc48176dad10b67766d9032a0675e.tar.gz DiligentTools-7f903f32d1dfc48176dad10b67766d9032a0675e.zip | |
Updated IRenderDevice::CreateTexture and IRenderDevice::CreateBuffer to take pointers to initial data rather than references
Diffstat (limited to 'TextureLoader/src')
| -rw-r--r-- | TextureLoader/src/DDSLoader.cpp | 6 | ||||
| -rw-r--r-- | TextureLoader/src/TextureLoader.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/TextureLoader/src/DDSLoader.cpp b/TextureLoader/src/DDSLoader.cpp index a685fd9..d4e9792 100644 --- a/TextureLoader/src/DDSLoader.cpp +++ b/TextureLoader/src/DDSLoader.cpp @@ -972,7 +972,7 @@ static void CreateTexture( case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { desc.Type = arraySize > 1 ? RESOURCE_DIM_TEX_1D_ARRAY : RESOURCE_DIM_TEX_1D; - pDevice->CreateTexture( desc, InitData, texture ); + pDevice->CreateTexture( desc, &InitData, texture ); // ID3D11Texture1D* tex = nullptr; // hr = d3dDevice->CreateTexture1D(&desc, initData, &tex); @@ -1034,7 +1034,7 @@ static void CreateTexture( // desc.MiscFlags = miscFlags & ~D3D11_RESOURCE_MISC_TEXTURECUBE; //} - pDevice->CreateTexture( desc, InitData, texture ); + pDevice->CreateTexture( desc, &InitData, texture ); //ID3D11Texture2D* tex = nullptr; //hr = d3dDevice->CreateTexture2D(&desc, initData, &tex); @@ -1104,7 +1104,7 @@ static void CreateTexture( //desc.MiscFlags = miscFlags & ~D3D11_RESOURCE_MISC_TEXTURECUBE; - pDevice->CreateTexture( desc, InitData, texture ); + pDevice->CreateTexture( desc, &InitData, texture ); //ID3D11Texture3D* tex = nullptr; //hr = d3dDevice->CreateTexture3D(&desc, initData, &tex); diff --git a/TextureLoader/src/TextureLoader.cpp b/TextureLoader/src/TextureLoader.cpp index c0fa274..0b6529c 100644 --- a/TextureLoader/src/TextureLoader.cpp +++ b/TextureLoader/src/TextureLoader.cpp @@ -239,7 +239,7 @@ namespace Diligent TexData.pSubResources = pSubResources.data(); TexData.NumSubresources = TexDesc.MipLevels; - pDevice->CreateTexture( TexDesc, TexData, ppTexture ); + pDevice->CreateTexture( TexDesc, &TexData, ppTexture ); } void CreateTextureFromDDS( IDataBlob *pDDSData, |