From 033df9926683c316614e0e3da03b30e1ec992de4 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 23 Nov 2019 17:02:30 -0800 Subject: Updated clang-format workaround for brace-on-the-same line in lambdas --- Graphics/GraphicsEngine/include/DeviceObjectBase.h | 4 ++-- Graphics/GraphicsEngine/include/ShaderResourceVariableBase.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Graphics/GraphicsEngine') 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 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; }); } -- cgit v1.2.3