TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/garagegames/Torque3D into development

Browse source
This commit is contained in:
Areloch 2018-09-02 04:32:18 -05:00
parent 878b68cc39 656c052d32
commit 114a82b328
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/gfx/D3D11/gfxD3D11TextureObject.cpp
View file

@ -202,9 +202,7 @@ bool GFXD3D11TextureObject::copyToBmp(GBitmap* bmp)
else
// unsupported
AssertFatal(false, "GFXD3D11TextureObject::copyToBmp - unsupported bitmap format");
PROFILE_START(GFXD3D11TextureObject_copyToBmp_pixCopy);
//create temp staging texture
D3D11_TEXTURE2D_DESC desc;
static_cast<ID3D11Texture2D*>(mD3DTexture)->GetDesc(&desc);
@ -216,7 +214,7 @@ bool GFXD3D11TextureObject::copyToBmp(GBitmap* bmp)
HRESULT hr = D3D11DEVICE->CreateTexture2D(&desc, NULL, &pStagingTexture);
if (FAILED(hr))
{
Con::errorf("GFXD3D11TextureObject::copyToBmp - Failed to create staging texture");
Con::errorf("GFXD3D11TextureObject::copyToBmp - Failed to create staging texture");
return false;
}
@ -270,7 +268,6 @@ bool GFXD3D11TextureObject::copyToBmp(GBitmap* bmp)
D3D11DEVICECONTEXT->Unmap(pStagingTexture, 0);
SAFE_RELEASE(pStagingTexture);
PROFILE_END();
return true;