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/GraphicsEngineOpenGL | |
| 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/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp index c5544ce3..14fbd670 100644 --- a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp @@ -109,12 +109,12 @@ void EngineFactoryOpenGLImpl::CreateDeviceAndSwapChainGL(const EngineGLCreateInf const SwapChainDesc& SCDesc, ISwapChain** ppSwapChain) { - 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 && ppImmediateContext && ppSwapChain, "Null pointer provided"); if (!ppDevice || !ppImmediateContext || !ppSwapChain) return; @@ -189,12 +189,12 @@ void EngineFactoryOpenGLImpl::AttachToActiveGLContext(const EngineGLCreateInfo& IRenderDevice** ppDevice, IDeviceContext** ppImmediateContext) { - 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 && ppImmediateContext, "Null pointer provided"); if (!ppDevice || !ppImmediateContext) return; |