summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3D11
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-03-19 14:55:44 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-03-19 14:55:44 +0000
commit9017ec06faef8ba9daaf616da397c98f3e3fd83f (patch)
treeb1e764e659b8a0381330f83ac241fe5c89340753 /Graphics/GraphicsEngineD3D11
parentFixed issue with staging allocations in Vulkan backend on Integrated GPUs (diff)
downloadDiligentCore-9017ec06faef8ba9daaf616da397c98f3e3fd83f.tar.gz
DiligentCore-9017ec06faef8ba9daaf616da397c98f3e3fd83f.zip
Added error message when attempting to create typeless texture with GENERAT_MIPS flag in D3D12 and Vk backends (fixed https://github.com/DiligentGraphics/DiligentCore/issues/70)
Diffstat (limited to 'Graphics/GraphicsEngineD3D11')
-rw-r--r--Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
index 48c82c4b..48e33434 100644
--- a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
@@ -39,8 +39,9 @@ TextureBaseD3D11 :: TextureBaseD3D11(IReferenceCounters* pRefCounters,
const TextureData* pInitData /*= nullptr*/) :
TTextureBase(pRefCounters, TexViewObjAllocator, pRenderDeviceD3D11, TexDesc)
{
- if( TexDesc.Usage == USAGE_STATIC && (pInitData == nullptr || pInitData->pSubResources == nullptr))
- LOG_ERROR_AND_THROW("Static textures must be initialized with data at creation time");
+ if (m_Desc.Usage == USAGE_STATIC && (pInitData == nullptr || pInitData->pSubResources == nullptr))
+ LOG_ERROR_AND_THROW("Static textures must be initialized with data at creation time: pInitData can't be null");
+
SetState(RESOURCE_STATE_UNDEFINED);
}