diff options
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp | 1 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp | 2 |
2 files changed, 1 insertions, 2 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 |