diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-13 18:03:15 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-13 18:03:15 +0000 |
| commit | 996bfb53528aeaaba532413bf1848a0ebc3b03f0 (patch) | |
| tree | cec9681ee72a3f984745227636cabf2bd2f983ab /Graphics/GraphicsEngineD3D11 | |
| parent | Fixed HLSL2GLSLConverterTest.CS_RWTex2D_1 test on 32-bit D3D12 (diff) | |
| download | DiligentCore-996bfb53528aeaaba532413bf1848a0ebc3b03f0.tar.gz DiligentCore-996bfb53528aeaaba532413bf1848a0ebc3b03f0.zip | |
Unit tests: capturing debug output; fixed minor issue with viewport in Vk backend.
Diffstat (limited to 'Graphics/GraphicsEngineD3D11')
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp index 6ffb2731..161ab79c 100644 --- a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp @@ -99,12 +99,12 @@ void EngineFactoryD3D11Impl::CreateDeviceAndContextsD3D11(const EngineD3D11Creat IRenderDevice** ppDevice, IDeviceContext** ppContexts) { - if (EngineCI.APIVersion != DILIGENT_API_VERSION) - LOG_ERROR_AND_THROW("Diligent Engine runtime (", EngineCI.APIVersion, ") is not compatible with the client API version (", DILIGENT_API_VERSION, ")"); - if (EngineCI.DebugMessageCallback != nullptr) SetDebugMessageCallback(EngineCI.DebugMessageCallback); + if (EngineCI.APIVersion != DILIGENT_API_VERSION) + LOG_ERROR_AND_THROW("Diligent Engine runtime (", EngineCI.APIVersion, ") is not compatible with the client API version (", DILIGENT_API_VERSION, ")"); + VERIFY(ppDevice && ppContexts, "Null pointer provided"); if (!ppDevice || !ppContexts) return; @@ -205,12 +205,12 @@ void EngineFactoryD3D11Impl::AttachToD3D11Device(void* pd IRenderDevice** ppDevice, IDeviceContext** ppContexts) { - if (EngineCI.APIVersion != DILIGENT_API_VERSION) - LOG_ERROR_AND_THROW("Diligent Engine runtime (", EngineCI.APIVersion, ") is not compatible with the client API version (", DILIGENT_API_VERSION, ")"); - if (EngineCI.DebugMessageCallback != nullptr) SetDebugMessageCallback(EngineCI.DebugMessageCallback); + if (EngineCI.APIVersion != DILIGENT_API_VERSION) + LOG_ERROR_AND_THROW("Diligent Engine runtime (", EngineCI.APIVersion, ") is not compatible with the client API version (", DILIGENT_API_VERSION, ")"); + VERIFY(ppDevice && ppContexts, "Null pointer provided"); if (!ppDevice || !ppContexts) return; |