From 4f5f8dba281db17644f428bd466d80c3eafcda0e Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 1 Feb 2015 11:19:14 +0100 Subject: [PATCH] Reverted change (nw) --- 3rdparty/bgfx/src/renderer_d3d11.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/3rdparty/bgfx/src/renderer_d3d11.cpp b/3rdparty/bgfx/src/renderer_d3d11.cpp index 78fe4927443..dde20bc7584 100644 --- a/3rdparty/bgfx/src/renderer_d3d11.cpp +++ b/3rdparty/bgfx/src/renderer_d3d11.cpp @@ -2364,8 +2364,10 @@ namespace bgfx BX_CHECK(m_dynamic, "Must be dynamic!"); D3D11_MAPPED_SUBRESOURCE mapped; - BX_UNUSED(_discard); - D3D11_MAP type = D3D11_MAP_WRITE_DISCARD; + D3D11_MAP type = m_dynamic && ( (0 == _offset && m_size == _size) || _discard) + ? D3D11_MAP_WRITE_DISCARD + : D3D11_MAP_WRITE_NO_OVERWRITE + ; DX_CHECK(deviceCtx->Map(m_ptr, 0, type, 0, &mapped)); memcpy((uint8_t*)mapped.pData + _offset, _data, _size); deviceCtx->Unmap(m_ptr, 0);