summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngine
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-12-27 16:52:19 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-12-27 16:52:19 +0000
commit3452eb6fe6c1a7f4994652e898d839d4e3fda7a3 (patch)
tree6437cdd0548f9fa03fb2cfd36a5c4bd43a79cedb /Graphics/GraphicsEngine
parentFixed shader version when compiling glsl in Vulkan on Mac (diff)
downloadDiligentCore-3452eb6fe6c1a7f4994652e898d839d4e3fda7a3.tar.gz
DiligentCore-3452eb6fe6c1a7f4994652e898d839d4e3fda7a3.zip
Fix for memory access violation when reading debug name from d3d11 textures
Diffstat (limited to 'Graphics/GraphicsEngine')
-rw-r--r--Graphics/GraphicsEngine/include/DeviceObjectBase.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Graphics/GraphicsEngine/include/DeviceObjectBase.h b/Graphics/GraphicsEngine/include/DeviceObjectBase.h
index f9a53979..3ad1ef85 100644
--- a/Graphics/GraphicsEngine/include/DeviceObjectBase.h
+++ b/Graphics/GraphicsEngine/include/DeviceObjectBase.h
@@ -55,7 +55,7 @@ public:
// Do not keep strong reference to the device if the object is an internal device object
m_spDevice (bIsDeviceInternal ? nullptr : pDevice),
m_pDevice (pDevice),
- m_ObjectNameCopy(ObjDesc.Name ? ObjDesc.Name : ThisToString()),
+ m_ObjectNameCopy(ObjDesc.Name ? String{ObjDesc.Name} : ThisToString()),
m_Desc (ObjDesc)
{
m_Desc.Name = m_ObjectNameCopy.c_str();