diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-02-09 02:09:00 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-02-09 02:09:00 +0000 |
| commit | 4fa7bc4d7ec4999f04e6fa67d9dc9768ba082584 (patch) | |
| tree | 0ff3f4b1f7ea369f5d933358dbede8a7a4444e4c /Graphics | |
| parent | Fixed Metal backend (diff) | |
| download | DiligentCore-4fa7bc4d7ec4999f04e6fa67d9dc9768ba082584.tar.gz DiligentCore-4fa7bc4d7ec4999f04e6fa67d9dc9768ba082584.zip | |
Fixed few debug checks
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp index 0abee41f..a87bff16 100644 --- a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp @@ -99,7 +99,6 @@ Texture2DArray_OGL::Texture2DArray_OGL( IReferenceCounters* pRefCounters UNEXPECTED("Incorrect number of subresources"); } } - } ContextState.BindTexture( -1, m_BindTarget, GLObjectWrappers::GLTextureObj(false) ); diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp index 8ade1444..fab45d69 100644 --- a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp @@ -62,7 +62,7 @@ Texture2D_OGL::Texture2D_OGL( IReferenceCounters* pRefCounters, SetDefaultGLParameters(); - VERIFY( pInitData == nullptr, "Multisampled textures cannot be modified directly" ); + VERIFY(pInitData == nullptr || pInitData->pSubResources == nullptr, "Multisampled textures cannot be modified directly" ); #else LOG_ERROR_AND_THROW("Multisampled textures are not supported"); #endif diff --git a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp index faeff985..de5bbf9e 100644 --- a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp @@ -59,7 +59,7 @@ BufferVkImpl :: BufferVkImpl(IReferenceCounters* pRefCounters, if (m_Desc.CPUAccessFlags == CPU_ACCESS_WRITE) { - if (pBuffData != nullptr ) + if (pBuffData != nullptr && pBuffData->pData != nullptr) LOG_BUFFER_ERROR_AND_THROW("CPU-writable staging buffers must be updated via map") } } |