diff --git a/Source/Engine/Graphics/Shaders/GPUShader.cpp b/Source/Engine/Graphics/Shaders/GPUShader.cpp
index 3639e01b1..e76ee9996 100644
--- a/Source/Engine/Graphics/Shaders/GPUShader.cpp
+++ b/Source/Engine/Graphics/Shaders/GPUShader.cpp
@@ -120,7 +120,7 @@ bool GPUShader::Create(MemoryReadStream& stream)
             GPUShaderProgram* shader = CreateGPUShaderProgram(type, initializer, cache, cacheSize, stream);
             if (shader == nullptr)
             {
-                LOG(Warning, "Failed to create shader program.");
+                LOG(Error, "Failed to create {} Shader program '{}'.", ::ToString(type), String(initializer.Name));
                 return true;
             }
 
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUBufferDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUBufferDX11.cpp
index b83ab6a08..352fd921a 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUBufferDX11.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUBufferDX11.cpp
@@ -105,7 +105,7 @@ bool GPUBufferDX11::OnInit()
         data.SysMemPitch = bufferDesc.ByteWidth;
         data.SysMemSlicePitch = 0;
     }
-    VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateBuffer(&bufferDesc, _desc.InitData ? &data : nullptr, &_resource));
+    VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateBuffer(&bufferDesc, _desc.InitData ? &data : nullptr, &_resource));
 
     // Set state
     DX_SET_DEBUG_NAME(_resource, GetName());
@@ -135,7 +135,7 @@ bool GPUBufferDX11::OnInit()
             srvDesc.Buffer.NumElements = numElements;
         }
         ID3D11ShaderResourceView* srv;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateShaderResourceView(_resource, &srvDesc, &srv));
+        VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateShaderResourceView(_resource, &srvDesc, &srv));
         _view.SetSRV(srv);
     }
     if (useUAV)
@@ -156,7 +156,7 @@ bool GPUBufferDX11::OnInit()
         else
             uavDesc.Format = RenderToolsDX::ToDxgiFormat(PixelFormatExtensions::FindUnorderedAccessFormat(_desc.Format));
         ID3D11UnorderedAccessView* uav;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateUnorderedAccessView(_resource, &uavDesc, &uav));
+        VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateUnorderedAccessView(_resource, &uavDesc, &uav));
         _view.SetUAV(uav);
     }
 
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp
index 10e60aebc..c29c6254d 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUDeviceDX11.cpp
@@ -143,7 +143,7 @@ GPUDevice* GPUDeviceDX11::Create()
         if (tempAdapter && TryCreateDevice(tempAdapter, maxAllowedFeatureLevel, &adapter.MaxFeatureLevel))
         {
             adapter.Index = index;
-            VALIDATE_DIRECTX_RESULT(tempAdapter->GetDesc(&adapter.Description));
+            VALIDATE_DIRECTX_CALL(tempAdapter->GetDesc(&adapter.Description));
             uint32 outputs = RenderToolsDX::CountAdapterOutputs(tempAdapter);
 
             LOG(Info, "Adapter {1}: '{0}', DirectX {2}", adapter.Description.Description, index, RenderToolsDX::GetFeatureLevelString(adapter.MaxFeatureLevel));
@@ -163,7 +163,7 @@ GPUDevice* GPUDeviceDX11::Create()
             if (tempAdapter && TryCreateDevice(tempAdapter, maxAllowedFeatureLevel, &adapter.MaxFeatureLevel))
             {
                 DXGI_ADAPTER_DESC desc;
-                VALIDATE_DIRECTX_RESULT(tempAdapter->GetDesc(&desc));
+                VALIDATE_DIRECTX_CALL(tempAdapter->GetDesc(&desc));
                 for (int i = 0; i < adapters.Count(); i++)
                 {
                     if (adapters[i].Description.AdapterLuid.LowPart == desc.AdapterLuid.LowPart &&
@@ -274,7 +274,7 @@ ID3D11BlendState* GPUDeviceDX11::GetBlendState(const BlendingMode& blending)
 #endif
 
     // Create object
-    VALIDATE_DIRECTX_RESULT(_device->CreateBlendState(&desc, &blendState));
+    VALIDATE_DIRECTX_CALL(_device->CreateBlendState(&desc, &blendState));
 
     // Cache blend state
     BlendStates.Add(blending, blendState);
@@ -333,7 +333,7 @@ bool GPUDeviceDX11::Init()
     // Create DirectX device
     D3D_FEATURE_LEVEL createdFeatureLevel = static_cast<D3D_FEATURE_LEVEL>(0);
     auto targetFeatureLevel = GetD3DFeatureLevel();
-    VALIDATE_DIRECTX_RESULT(D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, &targetFeatureLevel, 1, D3D11_SDK_VERSION, &_device, &createdFeatureLevel, &_imContext));
+    VALIDATE_DIRECTX_CALL(D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, &targetFeatureLevel, 1, D3D11_SDK_VERSION, &_device, &createdFeatureLevel, &_imContext));
 
     // Validate result
     ASSERT(_device);
@@ -409,7 +409,7 @@ bool GPUDeviceDX11::Init()
     // Init debug layer
 #if GPU_ENABLE_DIAGNOSTICS
     ComPtr<ID3D11InfoQueue> infoQueue;
-    VALIDATE_DIRECTX_RESULT(_device->QueryInterface(IID_PPV_ARGS(&infoQueue)));
+    VALIDATE_DIRECTX_CALL(_device->QueryInterface(IID_PPV_ARGS(&infoQueue)));
     if (infoQueue)
     {
         D3D11_INFO_QUEUE_FILTER filter;
@@ -457,7 +457,7 @@ bool GPUDeviceDX11::Init()
         samplerDesc.MinLOD = 0;
         samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
         result = _device->CreateSamplerState(&samplerDesc, &_samplerLinearClamp);
-        LOG_DIRECTX_RESULT_WITH_RETURN(result);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 
         // Point Clamp
         samplerDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
@@ -467,7 +467,7 @@ bool GPUDeviceDX11::Init()
         samplerDesc.MinLOD = 0;
         samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
         result = _device->CreateSamplerState(&samplerDesc, &_samplerPointClamp);
-        LOG_DIRECTX_RESULT_WITH_RETURN(result);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 
         // Linear Wrap
         samplerDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
@@ -477,7 +477,7 @@ bool GPUDeviceDX11::Init()
         samplerDesc.MinLOD = 0;
         samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
         result = _device->CreateSamplerState(&samplerDesc, &_samplerLinearWrap);
-        LOG_DIRECTX_RESULT_WITH_RETURN(result);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 
         // Point Wrap
         samplerDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
@@ -487,7 +487,7 @@ bool GPUDeviceDX11::Init()
         samplerDesc.MinLOD = 0;
         samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
         result = _device->CreateSamplerState(&samplerDesc, &_samplerPointWrap);
-        LOG_DIRECTX_RESULT_WITH_RETURN(result);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 
         // Shadow
         samplerDesc.Filter = D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT;
@@ -500,7 +500,7 @@ bool GPUDeviceDX11::Init()
         samplerDesc.MinLOD = 0;
         samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
         result = _device->CreateSamplerState(&samplerDesc, &_samplerShadow);
-        LOG_DIRECTX_RESULT_WITH_RETURN(result);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 
         // Shadow PCF
         samplerDesc.Filter = D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR;
@@ -514,7 +514,7 @@ bool GPUDeviceDX11::Init()
         samplerDesc.MinLOD = 0;
         samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
         result = _device->CreateSamplerState(&samplerDesc, &_samplerShadowPCF);
-        LOG_DIRECTX_RESULT_WITH_RETURN(result);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
     }
 
     // Rasterizer States
@@ -534,7 +534,7 @@ bool GPUDeviceDX11::Init()
 			rDesc.AntialiasedLineEnable = !!wireframe; \
 			rDesc.DepthClipEnable = !!depthClip; \
 			result = _device->CreateRasterizerState(&rDesc, &RasterizerStates[index]); \
-			LOG_DIRECTX_RESULT_WITH_RETURN(result)
+			LOG_DIRECTX_RESULT_WITH_RETURN(result, true)
         CREATE_RASTERIZER_STATE(CullMode::Normal, D3D11_CULL_BACK, false, false);
         CREATE_RASTERIZER_STATE(CullMode::Inverted, D3D11_CULL_FRONT, false, false);
         CREATE_RASTERIZER_STATE(CullMode::TwoSided, D3D11_CULL_NONE, false, false);
@@ -568,7 +568,7 @@ bool GPUDeviceDX11::Init()
 			dsDesc.DepthFunc = (D3D11_COMPARISON_FUNC)depthFunc; \
 			index = (int32)depthFunc + (depthEnable ? 0 : 9) + (depthWrite ? 0 : 18); \
 			HRESULT result = _device->CreateDepthStencilState(&dsDesc, &DepthStencilStates[index]); \
-			LOG_DIRECTX_RESULT_WITH_RETURN(result); }
+			LOG_DIRECTX_RESULT_WITH_RETURN(result, true); }
         CREATE_DEPTH_STENCIL_STATE(false, false);
         CREATE_DEPTH_STENCIL_STATE(false, true);
         CREATE_DEPTH_STENCIL_STATE(true, true);
@@ -666,7 +666,7 @@ void GPUDeviceDX11::DrawEnd()
 #if GPU_ENABLE_DIAGNOSTICS
     // Flush debug messages queue
     ComPtr<ID3D11InfoQueue> infoQueue;
-    VALIDATE_DIRECTX_RESULT(_device->QueryInterface(IID_PPV_ARGS(&infoQueue)));
+    VALIDATE_DIRECTX_CALL(_device->QueryInterface(IID_PPV_ARGS(&infoQueue)));
     if (infoQueue)
     {
         Array<uint8> data;
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSamplerDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSamplerDX11.cpp
index 428390637..fadb20ead 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSamplerDX11.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSamplerDX11.cpp
@@ -106,7 +106,7 @@ bool GPUSamplerDX11::OnInit()
     samplerDesc.MinLOD = _desc.MinMipLevel;
     samplerDesc.MaxLOD = _desc.MaxMipLevel;
     HRESULT result = _device->GetDevice()->CreateSamplerState(&samplerDesc, &SamplerState);
-    LOG_DIRECTX_RESULT_WITH_RETURN(result);
+    LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
     ASSERT(SamplerState != nullptr);
     _memoryUsage = sizeof(D3D11_SAMPLER_DESC);
 
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUShaderDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUShaderDX11.cpp
index 0e4b7ac0c..fd14f0aeb 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUShaderDX11.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUShaderDX11.cpp
@@ -10,6 +10,7 @@
 GPUShaderProgram* GPUShaderDX11::CreateGPUShaderProgram(ShaderStage type, const GPUShaderProgramInitializer& initializer, byte* cacheBytes, uint32 cacheSize, MemoryReadStream& stream)
 {
     GPUShaderProgram* shader = nullptr;
+    HRESULT result;
     switch (type)
     {
     case ShaderStage::Vertex:
@@ -90,12 +91,13 @@ GPUShaderProgram* GPUShaderDX11::CreateGPUShaderProgram(ShaderStage type, const
         if (inputLayoutSize > 0)
         {
             // Create input layout
-            VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateInputLayout(inputLayoutDesc, inputLayoutSize, cacheBytes, cacheSize, &inputLayout));
+            VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateInputLayout(inputLayoutDesc, inputLayoutSize, cacheBytes, cacheSize, &inputLayout));
         }
 
         // Create shader
         ID3D11VertexShader* buffer = nullptr;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateVertexShader(cacheBytes, cacheSize, nullptr, &buffer));
+        result = _device->GetDevice()->CreateVertexShader(cacheBytes, cacheSize, nullptr, &buffer);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, nullptr);
 
         // Create object
         shader = New<GPUShaderProgramVSDX11>(initializer, buffer, inputLayout, inputLayoutSize);
@@ -109,7 +111,8 @@ GPUShaderProgram* GPUShaderDX11::CreateGPUShaderProgram(ShaderStage type, const
 
         // Create shader
         ID3D11HullShader* buffer = nullptr;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateHullShader(cacheBytes, cacheSize, nullptr, &buffer));
+        result = _device->GetDevice()->CreateHullShader(cacheBytes, cacheSize, nullptr, &buffer);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, nullptr);
 
         // Create object
         shader = New<GPUShaderProgramHSDX11>(initializer, buffer, controlPointsCount);
@@ -119,7 +122,8 @@ GPUShaderProgram* GPUShaderDX11::CreateGPUShaderProgram(ShaderStage type, const
     {
         // Create shader
         ID3D11DomainShader* buffer = nullptr;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateDomainShader(cacheBytes, cacheSize, nullptr, &buffer));
+        VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateDomainShader(cacheBytes, cacheSize, nullptr, &buffer));
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, nullptr);
 
         // Create object
         shader = New<GPUShaderProgramDSDX11>(initializer, buffer);
@@ -129,7 +133,8 @@ GPUShaderProgram* GPUShaderDX11::CreateGPUShaderProgram(ShaderStage type, const
     {
         // Create shader
         ID3D11GeometryShader* buffer = nullptr;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateGeometryShader(cacheBytes, cacheSize, nullptr, &buffer));
+        result = _device->GetDevice()->CreateGeometryShader(cacheBytes, cacheSize, nullptr, &buffer);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, nullptr);
 
         // Create object
         shader = New<GPUShaderProgramGSDX11>(initializer, buffer);
@@ -139,7 +144,8 @@ GPUShaderProgram* GPUShaderDX11::CreateGPUShaderProgram(ShaderStage type, const
     {
         // Create shader
         ID3D11PixelShader* buffer = nullptr;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreatePixelShader(cacheBytes, cacheSize, nullptr, &buffer));
+        result = _device->GetDevice()->CreatePixelShader(cacheBytes, cacheSize, nullptr, &buffer);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, nullptr);
 
         // Create object
         shader = New<GPUShaderProgramPSDX11>(initializer, buffer);
@@ -149,7 +155,8 @@ GPUShaderProgram* GPUShaderDX11::CreateGPUShaderProgram(ShaderStage type, const
     {
         // Create shader
         ID3D11ComputeShader* buffer = nullptr;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateComputeShader(cacheBytes, cacheSize, nullptr, &buffer));
+        result = _device->GetDevice()->CreateComputeShader(cacheBytes, cacheSize, nullptr, &buffer);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, nullptr);
 
         // Create object
         shader = New<GPUShaderProgramCSDX11>(initializer, buffer);
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp
index 7b9564f54..d5c0e5c55 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp
@@ -28,13 +28,13 @@ GPUSwapChainDX11::GPUSwapChainDX11(GPUDeviceDX11* device, Window* window)
 
 void GPUSwapChainDX11::getBackBuffer()
 {
-    VALIDATE_DIRECTX_RESULT(_swapChain->GetBuffer(0, __uuidof(_backBuffer), reinterpret_cast<void**>(&_backBuffer)));
+    VALIDATE_DIRECTX_CALL(_swapChain->GetBuffer(0, __uuidof(_backBuffer), reinterpret_cast<void**>(&_backBuffer)));
 
     ID3D11RenderTargetView* rtv;
     ID3D11ShaderResourceView* srv;
-    VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateRenderTargetView(_backBuffer, nullptr, &rtv));
+    VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateRenderTargetView(_backBuffer, nullptr, &rtv));
 #if GPU_USE_WINDOW_SRV
-    VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateShaderResourceView(_backBuffer, nullptr, &srv));
+    VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateShaderResourceView(_backBuffer, nullptr, &srv));
 #else
 	srv = nullptr;
 #endif
@@ -55,7 +55,7 @@ void GPUSwapChainDX11::OnReleaseGPU()
     // Disable fullscreen mode
     if (_swapChain)
     {
-        VALIDATE_DIRECTX_RESULT(_swapChain->SetFullscreenState(false, nullptr));
+        VALIDATE_DIRECTX_CALL(_swapChain->SetFullscreenState(false, nullptr));
     }
 #endif
 
@@ -78,7 +78,7 @@ bool GPUSwapChainDX11::IsFullscreen()
 
     // Get state
     BOOL state;
-    VALIDATE_DIRECTX_RESULT(_swapChain->GetFullscreenState(&state, nullptr));
+    VALIDATE_DIRECTX_CALL(_swapChain->GetFullscreenState(&state, nullptr));
     return state == TRUE;
 }
 
@@ -229,21 +229,21 @@ bool GPUSwapChainDX11::Resize(int32 width, int32 height)
         // Create swap chain
 #if PLATFORM_WINDOWS
         auto dxgi = _device->GetDXGIFactory();
-        VALIDATE_DIRECTX_RESULT(dxgi->CreateSwapChain(_device->GetDevice(), &swapChainDesc, &_swapChain));
+        VALIDATE_DIRECTX_CALL(dxgi->CreateSwapChain(_device->GetDevice(), &swapChainDesc, &_swapChain));
         ASSERT(_swapChain);
 
         // Disable DXGI changes to the window
-        VALIDATE_DIRECTX_RESULT(dxgi->MakeWindowAssociation(_windowHandle, DXGI_MWA_NO_ALT_ENTER));
+        VALIDATE_DIRECTX_CALL(dxgi->MakeWindowAssociation(_windowHandle, DXGI_MWA_NO_ALT_ENTER));
 #else
         auto dxgiFactory = (IDXGIFactory2*)_device->GetDXGIFactory();
-        VALIDATE_DIRECTX_RESULT(dxgiFactory->CreateSwapChainForCoreWindow(_device->GetDevice(), static_cast<IUnknown*>(_windowHandle), &swapChainDesc, nullptr, &_swapChain));
+        VALIDATE_DIRECTX_CALL(dxgiFactory->CreateSwapChainForCoreWindow(_device->GetDevice(), static_cast<IUnknown*>(_windowHandle), &swapChainDesc, nullptr, &_swapChain));
         ASSERT(_swapChain);
 
         // Ensure that DXGI does not queue more than one frame at a time. This both reduces latency and
         // ensures that the application will only render after each VSync, minimizing power consumption.
         ComPtr<IDXGIDevice2> dxgiDevice;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->QueryInterface(IID_PPV_ARGS(&dxgiDevice)));
-        VALIDATE_DIRECTX_RESULT(dxgiDevice->SetMaximumFrameLatency(1));
+        VALIDATE_DIRECTX_CALL(_device->GetDevice()->QueryInterface(IID_PPV_ARGS(&dxgiDevice)));
+        VALIDATE_DIRECTX_CALL(dxgiDevice->SetMaximumFrameLatency(1));
 #endif
     }
     else
@@ -252,10 +252,10 @@ bool GPUSwapChainDX11::Resize(int32 width, int32 height)
 
 #if PLATFORM_WINDOWS
         _swapChain->GetDesc(&swapChainDesc);
-        VALIDATE_DIRECTX_RESULT(_swapChain->ResizeBuffers(swapChainDesc.BufferCount, width, height, swapChainDesc.BufferDesc.Format, swapChainDesc.Flags));
+        VALIDATE_DIRECTX_CALL(_swapChain->ResizeBuffers(swapChainDesc.BufferCount, width, height, swapChainDesc.BufferDesc.Format, swapChainDesc.Flags));
 #else
         _swapChain->GetDesc1(&swapChainDesc);
-        VALIDATE_DIRECTX_RESULT(_swapChain->ResizeBuffers(swapChainDesc.BufferCount, width, height, swapChainDesc.Format, swapChainDesc.Flags));
+        VALIDATE_DIRECTX_CALL(_swapChain->ResizeBuffers(swapChainDesc.BufferCount, width, height, swapChainDesc.Format, swapChainDesc.Flags));
 #endif
     }
 
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUTextureDX11.cpp b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUTextureDX11.cpp
index 73be91108..3d1979954 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX11/GPUTextureDX11.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX11/GPUTextureDX11.cpp
@@ -87,7 +87,7 @@ bool GPUTextureDX11::OnInit()
         result = device->CreateTexture2D(&textureDesc, nullptr, &texture);
         _resource = texture;
     }
-    LOG_DIRECTX_RESULT_WITH_RETURN(result);
+    LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
     ASSERT(_resource != nullptr);
     DX_SET_DEBUG_NAME(_resource, GetName());
 
@@ -135,7 +135,7 @@ void GPUTextureDX11::OnResidentMipsChanged()
     }
     ID3D11ShaderResourceView* srView = nullptr;
     if (mipLevels != 0)
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateShaderResourceView(_resource, &srDesc, &srView));
+        VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateShaderResourceView(_resource, &srDesc, &srView));
     GPUTextureViewDX11& view = IsVolume() ? _handleVolume : _handlesPerSlice[0];
     if (view.GetParent() == nullptr)
        view.Init(this, nullptr, srView, nullptr, nullptr, Format(), MultiSampleLevel());
@@ -201,7 +201,7 @@ void GPUTextureDX11::initHandles()
             srDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D;
             srDesc.Texture3D.MostDetailedMip = 0;
             srDesc.Texture3D.MipLevels = mipLevels;
-            VALIDATE_DIRECTX_RESULT(device->CreateShaderResourceView(_resource, &srDesc, &srView));
+            VALIDATE_DIRECTX_CALL(device->CreateShaderResourceView(_resource, &srDesc, &srView));
         }
         if (useRTV)
         {
@@ -209,7 +209,7 @@ void GPUTextureDX11::initHandles()
             rtDesc.Texture3D.MipSlice = 0;
             rtDesc.Texture3D.FirstWSlice = 0;
             rtDesc.Texture3D.WSize = Depth();
-            VALIDATE_DIRECTX_RESULT(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
+            VALIDATE_DIRECTX_CALL(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
         }
         if (useUAV)
         {
@@ -217,7 +217,7 @@ void GPUTextureDX11::initHandles()
             uaDesc.Texture3D.MipSlice = 0;
             uaDesc.Texture3D.WSize = Depth();
             uaDesc.Texture3D.FirstWSlice = 0;
-            VALIDATE_DIRECTX_RESULT(device->CreateUnorderedAccessView(_resource, &uaDesc, &uaView));
+            VALIDATE_DIRECTX_CALL(device->CreateUnorderedAccessView(_resource, &uaDesc, &uaView));
         }
         _handleVolume.Init(this, rtView, srView, nullptr, uaView, format, msaa);
 
@@ -232,7 +232,7 @@ void GPUTextureDX11::initHandles()
             for (int32 sliceIndex = 0; sliceIndex < Depth(); sliceIndex++)
             {
                 rtDesc.Texture3D.FirstWSlice = sliceIndex;
-                VALIDATE_DIRECTX_RESULT(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
+                VALIDATE_DIRECTX_CALL(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
                 _handlesPerSlice[sliceIndex].Init(this, rtView, nullptr, nullptr, nullptr, format, msaa);
             }
         }
@@ -263,7 +263,7 @@ void GPUTextureDX11::initHandles()
                     dsDesc.Texture2DArray.FirstArraySlice = arrayIndex;
                     dsDesc.Texture2DArray.MipSlice = 0;
                 }
-                VALIDATE_DIRECTX_RESULT(device->CreateDepthStencilView(_resource, &dsDesc, &dsView));
+                VALIDATE_DIRECTX_CALL(device->CreateDepthStencilView(_resource, &dsDesc, &dsView));
             }
             if (useRTV)
             {
@@ -281,7 +281,7 @@ void GPUTextureDX11::initHandles()
                     rtDesc.Texture2DArray.FirstArraySlice = arrayIndex;
                     rtDesc.Texture2DArray.MipSlice = 0;
                 }
-                VALIDATE_DIRECTX_RESULT(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
+                VALIDATE_DIRECTX_CALL(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
             }
             if (useSRV)
             {
@@ -305,7 +305,7 @@ void GPUTextureDX11::initHandles()
                         srDesc.Texture2DArray.MipLevels = mipLevels;
                         srDesc.Texture2DArray.MostDetailedMip = 0;
                     }
-                    VALIDATE_DIRECTX_RESULT(device->CreateShaderResourceView(_resource, &srDesc, &srView));
+                    VALIDATE_DIRECTX_CALL(device->CreateShaderResourceView(_resource, &srDesc, &srView));
                 }
             }
 
@@ -322,7 +322,7 @@ void GPUTextureDX11::initHandles()
                 dsDesc.Texture2DArray.ArraySize = arraySize;
                 dsDesc.Texture2DArray.FirstArraySlice = 0;
                 dsDesc.Texture2DArray.MipSlice = 0;
-                VALIDATE_DIRECTX_RESULT(device->CreateDepthStencilView(_resource, &dsDesc, &dsView));
+                VALIDATE_DIRECTX_CALL(device->CreateDepthStencilView(_resource, &dsDesc, &dsView));
             }
             if (useRTV)
             {
@@ -330,7 +330,7 @@ void GPUTextureDX11::initHandles()
                 rtDesc.Texture2DArray.ArraySize = arraySize;
                 rtDesc.Texture2DArray.FirstArraySlice = 0;
                 rtDesc.Texture2DArray.MipSlice = 0;
-                VALIDATE_DIRECTX_RESULT(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
+                VALIDATE_DIRECTX_CALL(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
             }
             if (useSRV)
             {
@@ -348,7 +348,7 @@ void GPUTextureDX11::initHandles()
                     srDesc.Texture2DArray.MipLevels = mipLevels;
                     srDesc.Texture2DArray.MostDetailedMip = 0;
                 }
-                VALIDATE_DIRECTX_RESULT(device->CreateShaderResourceView(_resource, &srDesc, &srView));
+                VALIDATE_DIRECTX_CALL(device->CreateShaderResourceView(_resource, &srDesc, &srView));
             }
             if (useUAV)
             {
@@ -356,7 +356,7 @@ void GPUTextureDX11::initHandles()
                 uaDesc.Texture2DArray.MipSlice = 0;
                 uaDesc.Texture2DArray.ArraySize = arraySize;
                 uaDesc.Texture2DArray.FirstArraySlice = 0;
-                VALIDATE_DIRECTX_RESULT(device->CreateUnorderedAccessView(_resource, &uaDesc, &uaView));
+                VALIDATE_DIRECTX_CALL(device->CreateUnorderedAccessView(_resource, &uaDesc, &uaView));
             }
             _handleArray.Init(this, rtView, srView, dsView, uaView, format, msaa);
         }
@@ -386,7 +386,7 @@ void GPUTextureDX11::initHandles()
                 dsDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D;
                 dsDesc.Texture2D.MipSlice = 0;
             }
-            VALIDATE_DIRECTX_RESULT(device->CreateDepthStencilView(_resource, &dsDesc, &dsView));
+            VALIDATE_DIRECTX_CALL(device->CreateDepthStencilView(_resource, &dsDesc, &dsView));
         }
         if (useRTV)
         {
@@ -406,7 +406,7 @@ void GPUTextureDX11::initHandles()
                 rtDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
                 rtDesc.Texture2D.MipSlice = 0;
             }
-            VALIDATE_DIRECTX_RESULT(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
+            VALIDATE_DIRECTX_CALL(device->CreateRenderTargetView(_resource, &rtDesc, &rtView));
         }
         if (useSRV)
         {
@@ -426,13 +426,13 @@ void GPUTextureDX11::initHandles()
                 srDesc.Texture2D.MostDetailedMip = 0;
                 srDesc.Texture2D.MipLevels = mipLevels;
             }
-            VALIDATE_DIRECTX_RESULT(device->CreateShaderResourceView(_resource, &srDesc, &srView));
+            VALIDATE_DIRECTX_CALL(device->CreateShaderResourceView(_resource, &srDesc, &srView));
         }
         if (useUAV)
         {
             uaDesc.ViewDimension = D3D11_UAV_DIMENSION_TEXTURE2D;
             uaDesc.Texture2D.MipSlice = 0;
-            VALIDATE_DIRECTX_RESULT(device->CreateUnorderedAccessView(_resource, &uaDesc, &uaView));
+            VALIDATE_DIRECTX_CALL(device->CreateUnorderedAccessView(_resource, &uaDesc, &uaView));
         }
         _handlesPerSlice[0].Init(this, rtView, srView, dsView, uaView, format, msaa);
     }
@@ -521,7 +521,7 @@ void GPUTextureDX11::initHandles()
             dsDesc.Flags = D3D11_DSV_READ_ONLY_DEPTH;
             if (PixelFormatExtensions::HasStencil(format))
                 dsDesc.Flags |= D3D11_DSV_READ_ONLY_STENCIL;
-            VALIDATE_DIRECTX_RESULT(device->CreateDepthStencilView(_resource, &dsDesc, &dsView));
+            VALIDATE_DIRECTX_CALL(device->CreateDepthStencilView(_resource, &dsDesc, &dsView));
         }
         ASSERT(!useRTV);
         rtView = nullptr;
@@ -543,7 +543,7 @@ void GPUTextureDX11::initHandles()
                 srDesc.Texture2D.MostDetailedMip = 0;
                 srDesc.Texture2D.MipLevels = mipLevels;
             }
-            VALIDATE_DIRECTX_RESULT(device->CreateShaderResourceView(_resource, &srDesc, &srView));
+            VALIDATE_DIRECTX_CALL(device->CreateShaderResourceView(_resource, &srDesc, &srView));
         }
         _handleReadOnlyDepth.Init(this, rtView, srView, dsView, nullptr, format, msaa);
     }
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/CommandAllocatorPoolDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/CommandAllocatorPoolDX12.cpp
index f0ad790af..9bb185030 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/CommandAllocatorPoolDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/CommandAllocatorPoolDX12.cpp
@@ -31,7 +31,7 @@ ID3D12CommandAllocator* CommandAllocatorPoolDX12::RequestAllocator(uint64 comple
         if (firstPair.First <= completedFenceValue)
         {
             allocator = firstPair.Second;
-            VALIDATE_DIRECTX_RESULT(allocator->Reset());
+            VALIDATE_DIRECTX_CALL(allocator->Reset());
             _ready.RemoveAtKeepOrder(0);
         }
     }
@@ -39,7 +39,7 @@ ID3D12CommandAllocator* CommandAllocatorPoolDX12::RequestAllocator(uint64 comple
     // If no allocators were ready to be reused, create a new one
     if (allocator == nullptr)
     {
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateCommandAllocator(_type, IID_PPV_ARGS(&allocator)));
+        VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateCommandAllocator(_type, IID_PPV_ARGS(&allocator)));
 #if GPU_ENABLE_RESOURCE_NAMING
         Char name[32];
         swprintf(name, 32, L"CommandAllocator %u", _pool.Count());
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/CommandQueueDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/CommandQueueDX12.cpp
index 8f78b749e..3235f4015 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/CommandQueueDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/CommandQueueDX12.cpp
@@ -111,7 +111,7 @@ bool CommandQueueDX12::Init()
     desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE;
     desc.NodeMask = 0;
     HRESULT result = _device->GetDevice()->CreateCommandQueue(&desc, IID_PPV_ARGS(&_commandQueue));
-    LOG_DIRECTX_RESULT_WITH_RETURN(result);
+    LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 #if GPU_ENABLE_RESOURCE_NAMING
     _commandQueue->SetName(TEXT("CommandQueueDX12::CommandQueue"));
 #endif
@@ -148,7 +148,7 @@ void CommandQueueDX12::WaitForGPU()
 
 uint64 CommandQueueDX12::ExecuteCommandList(ID3D12CommandList* list)
 {
-    VALIDATE_DIRECTX_RESULT((static_cast<ID3D12GraphicsCommandList*>(list))->Close());
+    VALIDATE_DIRECTX_CALL((static_cast<ID3D12GraphicsCommandList*>(list))->Close());
 
     _commandQueue->ExecuteCommandLists(1, &list);
 
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/DescriptorHeapDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/DescriptorHeapDX12.cpp
index 238318b2c..2ee2ea023 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/DescriptorHeapDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/DescriptorHeapDX12.cpp
@@ -73,7 +73,7 @@ bool DescriptorHeapWithSlotsDX12::Create(D3D12_DESCRIPTOR_HEAP_TYPE type, uint32
 
     // Create heap
     const HRESULT result = _device->GetDevice()->CreateDescriptorHeap(&desc, __uuidof(ID3D12DescriptorHeap), reinterpret_cast<void**>(&_heap));
-    LOG_DIRECTX_RESULT_WITH_RETURN(result);
+    LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 
     // Setup
     _type = type;
@@ -196,7 +196,7 @@ bool DescriptorHeapRingBufferDX12::Init()
     desc.Flags = _shaderVisible ? D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE : D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
     desc.NodeMask = 0;
     const HRESULT result = _device->GetDevice()->CreateDescriptorHeap(&desc, IID_PPV_ARGS(&_heap));
-    LOG_DIRECTX_RESULT_WITH_RETURN(result);
+    LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 
     // Setup
     _firstFree = 0;
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUBufferDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUBufferDX12.cpp
index 5d2d97f0b..8f948d246 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUBufferDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUBufferDX12.cpp
@@ -136,7 +136,7 @@ bool GPUBufferDX12::OnInit()
     // Create resource
     ID3D12Resource* resource;
     D3D12_RESOURCE_STATES initialState = D3D12_RESOURCE_STATE_COPY_DEST;
-    VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateCommittedResource(&heapProperties, D3D12_HEAP_FLAG_NONE, &resourceDesc, initialState, nullptr, IID_PPV_ARGS(&resource)));
+    VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateCommittedResource(&heapProperties, D3D12_HEAP_FLAG_NONE, &resourceDesc, initialState, nullptr, IID_PPV_ARGS(&resource)));
 
     // Set state
     initResource(resource, initialState, 1);
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
index 54f1a4290..e186054c2 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUContextDX12.cpp
@@ -83,7 +83,7 @@ GPUContextDX12::GPUContextDX12(GPUDeviceDX12* device, D3D12_COMMAND_LIST_TYPE ty
     FrameFenceValues[0] = 0;
     FrameFenceValues[1] = 0;
     _currentAllocator = _device->GetCommandQueue()->RequestAllocator();
-    VALIDATE_DIRECTX_RESULT(device->GetDevice()->CreateCommandList(0, type, _currentAllocator, nullptr, IID_PPV_ARGS(&_commandList)));
+    VALIDATE_DIRECTX_CALL(device->GetDevice()->CreateCommandList(0, type, _currentAllocator, nullptr, IID_PPV_ARGS(&_commandList)));
 #if GPU_ENABLE_RESOURCE_NAMING
     _commandList->SetName(TEXT("GPUContextDX12::CommandList"));
 #endif
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp
index 047b69bb5..e2266f551 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUDeviceDX12.cpp
@@ -77,7 +77,7 @@ GPUDevice* GPUDeviceDX12::Create()
 #endif
 #ifdef __ID3D12DeviceRemovedExtendedDataSettings_FWD_DEFINED__
     ComPtr<ID3D12DeviceRemovedExtendedDataSettings> dredSettings;
-    VALIDATE_DIRECTX_RESULT(D3D12GetDebugInterface(IID_PPV_ARGS(&dredSettings)));
+    VALIDATE_DIRECTX_CALL(D3D12GetDebugInterface(IID_PPV_ARGS(&dredSettings)));
     if (dredSettings)
     {
         // Turn on AutoBreadcrumbs and Page Fault reporting
@@ -116,7 +116,7 @@ GPUDevice* GPUDeviceDX12::Create()
         {
             adapter.Index = index;
             adapter.MaxFeatureLevel = D3D_FEATURE_LEVEL_12_0;
-            VALIDATE_DIRECTX_RESULT(tempAdapter->GetDesc(&adapter.Description));
+            VALIDATE_DIRECTX_CALL(tempAdapter->GetDesc(&adapter.Description));
             uint32 outputs = RenderToolsDX::CountAdapterOutputs(tempAdapter);
 
             // Send that info to the log
@@ -137,7 +137,7 @@ GPUDevice* GPUDeviceDX12::Create()
             if (tempAdapter && CheckDX12Support(tempAdapter))
             {
                 DXGI_ADAPTER_DESC desc;
-                VALIDATE_DIRECTX_RESULT(tempAdapter->GetDesc(&desc));
+                VALIDATE_DIRECTX_CALL(tempAdapter->GetDesc(&desc));
                 for (int i = 0; i < adapters.Count(); i++)
                 {
                     if (adapters[i].Description.AdapterLuid.LowPart == desc.AdapterLuid.LowPart &&
@@ -254,7 +254,7 @@ bool GPUDeviceDX12::Init()
 #if PLATFORM_XBOX_SCARLETT
     params.DisableDXR = TRUE;
 #endif
-    VALIDATE_DIRECTX_RESULT(D3D12XboxCreateDevice(nullptr, &params, IID_GRAPHICS_PPV_ARGS(&_device)));
+    VALIDATE_DIRECTX_CALL(D3D12XboxCreateDevice(nullptr, &params, IID_GRAPHICS_PPV_ARGS(&_device)));
 
     // Setup adapter
     D3D12XBOX_GPU_HARDWARE_CONFIGURATION hwConfig = {};
@@ -319,12 +319,12 @@ bool GPUDeviceDX12::Init()
     }
 
     // Create DirectX device
-    VALIDATE_DIRECTX_RESULT(D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, IID_PPV_ARGS(&_device)));
+    VALIDATE_DIRECTX_CALL(D3D12CreateDevice(adapter, D3D_FEATURE_LEVEL_11_0, IID_PPV_ARGS(&_device)));
 
     // Debug Layer
 #if GPU_ENABLE_DIAGNOSTICS
     ComPtr<ID3D12InfoQueue> infoQueue;
-    VALIDATE_DIRECTX_RESULT(_device->QueryInterface(IID_PPV_ARGS(&infoQueue)));
+    VALIDATE_DIRECTX_CALL(_device->QueryInterface(IID_PPV_ARGS(&infoQueue)));
     if (infoQueue)
     {
         D3D12_INFO_QUEUE_FILTER filter;
@@ -363,7 +363,7 @@ bool GPUDeviceDX12::Init()
 
     // Spawn some info about the hardware
     D3D12_FEATURE_DATA_D3D12_OPTIONS options;
-    VALIDATE_DIRECTX_RESULT(_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)));
+    VALIDATE_DIRECTX_CALL(_device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)));
     LOG(Info, "Tiled Resources Tier: {0}", (int32)options.TiledResourcesTier);
     LOG(Info, "Resource Binding Tier: {0}", (int32)options.ResourceBindingTier);
     LOG(Info, "Conservative Rasterization Tier: {0}", (int32)options.ConservativeRasterizationTier);
@@ -662,10 +662,10 @@ bool GPUDeviceDX12::Init()
         // Serialize
         ComPtr<ID3DBlob> signature;
         ComPtr<ID3DBlob> error;
-        VALIDATE_DIRECTX_RESULT(D3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &signature, &error));
+        VALIDATE_DIRECTX_CALL(D3D12SerializeRootSignature(&rootSignatureDesc, D3D_ROOT_SIGNATURE_VERSION_1, &signature, &error));
 
         // Create
-        VALIDATE_DIRECTX_RESULT(_device->CreateRootSignature(0, signature->GetBufferPointer(), signature->GetBufferSize(), IID_PPV_ARGS(&_rootSignature)));
+        VALIDATE_DIRECTX_CALL(_device->CreateRootSignature(0, signature->GetBufferPointer(), signature->GetBufferSize(), IID_PPV_ARGS(&_rootSignature)));
     }
 
     // Upload buffer
@@ -896,14 +896,14 @@ void GPUDeviceDX12::OnResumed()
 void GPUDeviceDX12::updateFrameEvents()
 {
     ComPtr<IDXGIDevice1> dxgiDevice;
-    VALIDATE_DIRECTX_RESULT(_device->QueryInterface(IID_GRAPHICS_PPV_ARGS(&dxgiDevice)));
+    VALIDATE_DIRECTX_CALL(_device->QueryInterface(IID_GRAPHICS_PPV_ARGS(&dxgiDevice)));
     ComPtr<IDXGIAdapter> dxgiAdapter;
-    VALIDATE_DIRECTX_RESULT(dxgiDevice->GetAdapter(dxgiAdapter.GetAddressOf()));
+    VALIDATE_DIRECTX_CALL(dxgiDevice->GetAdapter(dxgiAdapter.GetAddressOf()));
     dxgiAdapter->GetDesc(&_adapter->Description);
     ComPtr<IDXGIOutput> dxgiOutput;
-    VALIDATE_DIRECTX_RESULT(dxgiAdapter->EnumOutputs(0, dxgiOutput.GetAddressOf()));
-    VALIDATE_DIRECTX_RESULT(_device->SetFrameIntervalX(dxgiOutput.Get(), D3D12XBOX_FRAME_INTERVAL_60_HZ, DX12_BACK_BUFFER_COUNT - 1u, D3D12XBOX_FRAME_INTERVAL_FLAG_NONE));
-    VALIDATE_DIRECTX_RESULT(_device->ScheduleFrameEventX(D3D12XBOX_FRAME_EVENT_ORIGIN, 0U, nullptr, D3D12XBOX_SCHEDULE_FRAME_EVENT_FLAG_NONE));
+    VALIDATE_DIRECTX_CALL(dxgiAdapter->EnumOutputs(0, dxgiOutput.GetAddressOf()));
+    VALIDATE_DIRECTX_CALL(_device->SetFrameIntervalX(dxgiOutput.Get(), D3D12XBOX_FRAME_INTERVAL_60_HZ, DX12_BACK_BUFFER_COUNT - 1u, D3D12XBOX_FRAME_INTERVAL_FLAG_NONE));
+    VALIDATE_DIRECTX_CALL(_device->ScheduleFrameEventX(D3D12XBOX_FRAME_EVENT_ORIGIN, 0U, nullptr, D3D12XBOX_SCHEDULE_FRAME_EVENT_FLAG_NONE));
 }
 
 #endif
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUSwapChainDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUSwapChainDX12.cpp
index 85d79582f..8a9ca1c64 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUSwapChainDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUSwapChainDX12.cpp
@@ -66,7 +66,7 @@ void GPUSwapChainDX12::OnReleaseGPU()
     // Disable fullscreen mode
     if (_swapChain)
     {
-        VALIDATE_DIRECTX_RESULT(_swapChain->SetFullscreenState(false, nullptr));
+        VALIDATE_DIRECTX_CALL(_swapChain->SetFullscreenState(false, nullptr));
     }
 #endif
 
@@ -100,7 +100,7 @@ bool GPUSwapChainDX12::IsFullscreen()
 
     // Get state
     BOOL state;
-    VALIDATE_DIRECTX_RESULT(_swapChain->GetFullscreenState(&state, nullptr));
+    VALIDATE_DIRECTX_CALL(_swapChain->GetFullscreenState(&state, nullptr));
     return state == TRUE;
 #endif
 }
@@ -221,7 +221,7 @@ bool GPUSwapChainDX12::Resize(int32 width, int32 height)
         // Create swap chain (it needs the queue so that it can force a flush on it)
         IDXGISwapChain1* swapChain;
         auto dxgiFactory = _device->GetDXGIFactory();
-        VALIDATE_DIRECTX_RESULT(dxgiFactory->CreateSwapChainForHwnd(_device->GetCommandQueueDX12(), _windowHandle, &swapChainDesc, &fullscreenDesc, nullptr, &swapChain));
+        VALIDATE_DIRECTX_CALL(dxgiFactory->CreateSwapChainForHwnd(_device->GetCommandQueueDX12(), _windowHandle, &swapChainDesc, &fullscreenDesc, nullptr, &swapChain));
         _swapChain = static_cast<IDXGISwapChain3*>(swapChain);
         ASSERT(_swapChain);
         DX_SET_DEBUG_NAME_EX(_swapChain, TEXT("RenderOutput"), TEXT("SwapChain"), TEXT(""));
@@ -229,7 +229,7 @@ bool GPUSwapChainDX12::Resize(int32 width, int32 height)
         _backBuffers.Resize(swapChainDesc.BufferCount);
 
         // Disable DXGI changes to the window
-        VALIDATE_DIRECTX_RESULT(dxgiFactory->MakeWindowAssociation(_windowHandle, DXGI_MWA_NO_ALT_ENTER));
+        VALIDATE_DIRECTX_CALL(dxgiFactory->MakeWindowAssociation(_windowHandle, DXGI_MWA_NO_ALT_ENTER));
     }
     else
     {
@@ -237,7 +237,7 @@ bool GPUSwapChainDX12::Resize(int32 width, int32 height)
 
         _swapChain->GetDesc1(&swapChainDesc);
 
-        VALIDATE_DIRECTX_RESULT(_swapChain->ResizeBuffers(swapChainDesc.BufferCount, width, height, swapChainDesc.Format, swapChainDesc.Flags));
+        VALIDATE_DIRECTX_CALL(_swapChain->ResizeBuffers(swapChainDesc.BufferCount, width, height, swapChainDesc.Format, swapChainDesc.Flags));
     }
 
     _currentFrameIndex = _swapChain->GetCurrentBackBufferIndex();
@@ -316,7 +316,7 @@ void GPUSwapChainDX12::getBackBuffer()
         swapChainBufferDesc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
         D3D12_CLEAR_VALUE swapChainOptimizedClearValue = {};
         swapChainOptimizedClearValue.Format = swapChainBufferDesc.Format;
-        VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateCommittedResource(
+        VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateCommittedResource(
             &swapChainHeapProperties,
             D3D12_HEAP_FLAG_ALLOW_DISPLAY,
             &swapChainBufferDesc,
@@ -324,7 +324,7 @@ void GPUSwapChainDX12::getBackBuffer()
             &swapChainOptimizedClearValue,
             IID_GRAPHICS_PPV_ARGS(&backbuffer)));
 #else
-        VALIDATE_DIRECTX_RESULT(_swapChain->GetBuffer(i, IID_PPV_ARGS(&backbuffer)));
+        VALIDATE_DIRECTX_CALL(_swapChain->GetBuffer(i, IID_PPV_ARGS(&backbuffer)));
 #endif
         DX_SET_DEBUG_NAME_EX(backbuffer, TEXT("RenderOutput"), TEXT("BackBuffer"), i);
         _backBuffers[i].Setup(this, backbuffer);
@@ -337,7 +337,7 @@ void GPUSwapChainDX12::Begin(RenderTask* task)
 {
     // Wait until frame start is signaled
     _framePipelineToken = D3D12XBOX_FRAME_PIPELINE_TOKEN_NULL;
-    VALIDATE_DIRECTX_RESULT(_device->GetDevice()->WaitFrameEventX(D3D12XBOX_FRAME_EVENT_ORIGIN, INFINITE, nullptr, D3D12XBOX_WAIT_FRAME_EVENT_FLAG_NONE, &_framePipelineToken));
+    VALIDATE_DIRECTX_CALL(_device->GetDevice()->WaitFrameEventX(D3D12XBOX_FRAME_EVENT_ORIGIN, INFINITE, nullptr, D3D12XBOX_WAIT_FRAME_EVENT_FLAG_NONE, &_framePipelineToken));
 
     GPUSwapChain::Begin(task);
 }
@@ -366,7 +366,7 @@ void GPUSwapChainDX12::Present(bool vsync)
     planeParameters.Token = _framePipelineToken;
     planeParameters.ResourceCount = 1;
     planeParameters.ppResources = &backBuffer;
-    VALIDATE_DIRECTX_RESULT(_device->GetCommandQueueDX12()->PresentX(1, &planeParameters, nullptr));
+    VALIDATE_DIRECTX_CALL(_device->GetCommandQueueDX12()->PresentX(1, &planeParameters, nullptr));
 
     // Base
     GPUSwapChain::Present(vsync);
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUTextureDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUTextureDX12.cpp
index dd7402097..b89d65275 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUTextureDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUTextureDX12.cpp
@@ -113,7 +113,7 @@ bool GPUTextureDX12::OnInit()
         resourceDesc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
         resourceDesc.Flags = D3D12_RESOURCE_FLAG_NONE;
         auto result = device->CreateCommittedResource(&heapProperties, D3D12_HEAP_FLAG_NONE, &resourceDesc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr, IID_PPV_ARGS(&resource));
-        LOG_DIRECTX_RESULT_WITH_RETURN(result);
+        LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
         initResource(resource, D3D12_RESOURCE_STATE_COPY_DEST, 1);
         DX_SET_DEBUG_NAME(_resource, GetName());
         _memoryUsage = totalSize;
@@ -184,7 +184,7 @@ bool GPUTextureDX12::OnInit()
 
     // Create texture
     auto result = device->CreateCommittedResource(&heapProperties, D3D12_HEAP_FLAG_NONE, &resourceDesc, initialState, clearValuePtr, IID_PPV_ARGS(&resource));
-    LOG_DIRECTX_RESULT_WITH_RETURN(result);
+    LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
 
     // Set state
     bool isRead = useSRV || useUAV;
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUTimerQueryDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUTimerQueryDX12.cpp
index 6df638d23..7c814baed 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/GPUTimerQueryDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/GPUTimerQueryDX12.cpp
@@ -37,7 +37,7 @@ void GPUTimerQueryDX12::End()
     heap.EndQuery(context, _end);
 
     const auto queue = _device->GetCommandQueue()->GetCommandQueue();
-    VALIDATE_DIRECTX_RESULT(queue->GetTimestampFrequency(&_gpuFrequency));
+    VALIDATE_DIRECTX_CALL(queue->GetTimestampFrequency(&_gpuFrequency));
 
     _endCalled = true;
 }
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/QueryHeapDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/QueryHeapDX12.cpp
index dc6939cff..ea6af0a2d 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/QueryHeapDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/QueryHeapDX12.cpp
@@ -41,7 +41,7 @@ bool QueryHeapDX12::Init()
     heapDesc.Count = _queryHeapCount;
     heapDesc.NodeMask = 0;
     HRESULT result = _device->GetDevice()->CreateQueryHeap(&heapDesc, IID_PPV_ARGS(&_queryHeap));
-    LOG_DIRECTX_RESULT_WITH_RETURN(result);
+    LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
     DX_SET_DEBUG_NAME(_queryHeap, "Query Heap");
 
     // Create the result buffer
@@ -64,7 +64,7 @@ bool QueryHeapDX12::Init()
     resourceDesc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
     resourceDesc.Flags = D3D12_RESOURCE_FLAG_NONE;
     result = _device->GetDevice()->CreateCommittedResource(&heapProperties, D3D12_HEAP_FLAG_NONE, &resourceDesc, D3D12_RESOURCE_STATE_COPY_DEST, nullptr, IID_PPV_ARGS(&_resultBuffer));
-    LOG_DIRECTX_RESULT_WITH_RETURN(result);
+    LOG_DIRECTX_RESULT_WITH_RETURN(result, true);
     DX_SET_DEBUG_NAME(_resultBuffer, "Query Heap Result Buffer");
 
     // Start out with an open query batch
@@ -181,7 +181,7 @@ void* QueryHeapDX12::ResolveQuery(ElementHandle& handle)
             range.Begin = batch.Start * _resultSize;
             range.End = range.Begin + batch.Count * _resultSize;
             void* mapped = nullptr;
-            VALIDATE_DIRECTX_RESULT(_resultBuffer->Map(0, &range, &mapped));
+            VALIDATE_DIRECTX_CALL(_resultBuffer->Map(0, &range, &mapped));
 
             // Copy the results data
             Platform::MemoryCopy(_resultData.Get() + range.Begin, (byte*)mapped + range.Begin, batch.Count * _resultSize);
diff --git a/Source/Engine/GraphicsDevice/DirectX/DX12/UploadBufferDX12.cpp b/Source/Engine/GraphicsDevice/DirectX/DX12/UploadBufferDX12.cpp
index 27aa4c697..11f1b7ffe 100644
--- a/Source/Engine/GraphicsDevice/DirectX/DX12/UploadBufferDX12.cpp
+++ b/Source/Engine/GraphicsDevice/DirectX/DX12/UploadBufferDX12.cpp
@@ -229,7 +229,7 @@ UploadBufferPageDX12::UploadBufferPageDX12(GPUDeviceDX12* device, uint64 size)
     resourceDesc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR;
     resourceDesc.Flags = D3D12_RESOURCE_FLAG_NONE;
     ID3D12Resource* resource;
-    VALIDATE_DIRECTX_RESULT(_device->GetDevice()->CreateCommittedResource(&heapProperties, D3D12_HEAP_FLAG_NONE, &resourceDesc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr, IID_PPV_ARGS(&resource)));
+    VALIDATE_DIRECTX_CALL(_device->GetDevice()->CreateCommittedResource(&heapProperties, D3D12_HEAP_FLAG_NONE, &resourceDesc, D3D12_RESOURCE_STATE_GENERIC_READ, nullptr, IID_PPV_ARGS(&resource)));
 
     // Set state
     initResource(resource, D3D12_RESOURCE_STATE_GENERIC_READ, 1);
@@ -238,7 +238,7 @@ UploadBufferPageDX12::UploadBufferPageDX12(GPUDeviceDX12* device, uint64 size)
     GPUAddress = _resource->GetGPUVirtualAddress();
 
     // Map buffer
-    VALIDATE_DIRECTX_RESULT(_resource->Map(0, nullptr, &CPUAddress));
+    VALIDATE_DIRECTX_CALL(_resource->Map(0, nullptr, &CPUAddress));
 }
 
 void UploadBufferPageDX12::OnReleaseGPU()
diff --git a/Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.h b/Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.h
index 61d32cff0..ef783b218 100644
--- a/Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.h
+++ b/Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.h
@@ -272,15 +272,15 @@ namespace RenderToolsDX
 #if GPU_ENABLE_ASSERTION
 
 // DirectX results validation
-#define VALIDATE_DIRECTX_RESULT(x) { HRESULT result = x; if (FAILED(result)) RenderToolsDX::ValidateD3DResult(result, __FILE__, __LINE__); }
+#define VALIDATE_DIRECTX_CALL(x) { HRESULT result = x; if (FAILED(result)) RenderToolsDX::ValidateD3DResult(result, __FILE__, __LINE__); }
 #define LOG_DIRECTX_RESULT(result) if (FAILED(result)) RenderToolsDX::LogD3DResult(result, __FILE__, __LINE__)
-#define LOG_DIRECTX_RESULT_WITH_RETURN(result) if (FAILED(result)) { RenderToolsDX::LogD3DResult(result, __FILE__, __LINE__); return true; }
+#define LOG_DIRECTX_RESULT_WITH_RETURN(result, returnValue) if (FAILED(result)) { RenderToolsDX::LogD3DResult(result, __FILE__, __LINE__); return returnValue; }
 
 #else
 
-#define VALIDATE_DIRECTX_RESULT(x) x
+#define VALIDATE_DIRECTX_CALL(x) x
 #define LOG_DIRECTX_RESULT(result) if(FAILED(result)) RenderToolsDX::LogD3DResult(result)
-#define LOG_DIRECTX_RESULT_WITH_RETURN(result) if(FAILED(result)) { RenderToolsDX::LogD3DResult(result); return true; }
+#define LOG_DIRECTX_RESULT_WITH_RETURN(result, returnValue) if(FAILED(result)) { RenderToolsDX::LogD3DResult(result); return returnValue; }
 
 #endif
 
diff --git a/Source/Engine/Renderer/HistogramPass.cpp b/Source/Engine/Renderer/HistogramPass.cpp
index ed28d27b3..77d228430 100644
--- a/Source/Engine/Renderer/HistogramPass.cpp
+++ b/Source/Engine/Renderer/HistogramPass.cpp
@@ -26,7 +26,7 @@ PACK_STRUCT(struct HistogramData {
 GPUBuffer* HistogramPass::Render(RenderContext& renderContext, GPUTexture* colorBuffer)
 {
     auto device = GPUDevice::Instance;
-    auto context = device->GetMainContext();;
+    auto context = device->GetMainContext();
     if (checkIfSkipPass() || !_isSupported)
         return nullptr;