diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-11-24 01:02:30 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-11-24 01:02:30 +0000 |
| commit | 033df9926683c316614e0e3da03b30e1ec992de4 (patch) | |
| tree | 2a09634cbdad2f4dc0fb0532adf29fde6596a5a3 /Graphics/GraphicsEngine | |
| parent | clang-formatted GraphicsEngineD3D11 project (diff) | |
| download | DiligentCore-033df9926683c316614e0e3da03b30e1ec992de4.tar.gz DiligentCore-033df9926683c316614e0e3da03b30e1ec992de4.zip | |
Updated clang-format workaround for brace-on-the-same line in lambdas
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/DeviceObjectBase.h | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngine/include/DeviceObjectBase.h b/Graphics/GraphicsEngine/include/DeviceObjectBase.h index cc403b13..7f5e4128 100644 --- a/Graphics/GraphicsEngine/include/DeviceObjectBase.h +++ b/Graphics/GraphicsEngine/include/DeviceObjectBase.h @@ -120,8 +120,8 @@ public: RefCntAutoPtr<RenderDeviceImplType> pDevice; return TBase::Release( - [&]() // clang-format off - { // clang-format on + [&]() // + { // We must keep the device alive while the object is being destroyed // Note that internal device objects do not keep strong reference to the device if (!m_bIsDeviceInternal) diff --git a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h index ea13fb54..5ca4b016 100644 --- a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h +++ b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h @@ -61,8 +61,8 @@ inline SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE Uint32 NumVars) { return GetShaderVariableType(ShaderStage, DefaultVariableType, Variables, NumVars, - [&](const char* VarName) // clang-format off - { // clang-format on + [&](const char* VarName) // + { return strcmp(VarName, Name) == 0; }); } @@ -81,8 +81,8 @@ inline SHADER_RESOURCE_VARIABLE_TYPE GetShaderVariableType(SHADER_TYPE Uint32 NumVars) { return GetShaderVariableType(ShaderStage, DefaultVariableType, Variables, NumVars, - [&](const char* VarName) // clang-format off - { // clang-format on + [&](const char* VarName) // + { return Name.compare(VarName) == 0; }); } |