From be4170a8ed7e92065ba1ea24e586b46e6d216b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 26 Jan 2018 20:17:33 -0800 Subject: [PATCH] Cleanup. --- src/renderer_gl.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index bf4874f42..5ad896a3d 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -5270,7 +5270,7 @@ namespace bgfx { namespace gl && !s_textureFormat[m_requestedFormat].m_supported && !s_renderGL->m_textureSwizzleSupport ; - const bool unpackRowLength = BX_IGNORE_C4127(!!BGFX_CONFIG_RENDERER_OPENGL || s_extension[Extension::EXT_unpack_subimage].m_supported); + const bool unpackRowLength = !!BGFX_CONFIG_RENDERER_OPENGL || s_extension[Extension::EXT_unpack_subimage].m_supported; const bool compressed = bimg::isCompressed(bimg::TextureFormat::Enum(m_requestedFormat) ); const bool convert = false || (compressed && m_textureFormat != m_requestedFormat) @@ -5325,8 +5325,9 @@ namespace bgfx { namespace gl srcpitch = rectpitch; } - if (!unpackRowLength - && !convert) + if (BX_IGNORE_C4127(true + && !unpackRowLength + && !convert) ) { bimg::imageCopy(temp, width, height, 1, bpp, srcpitch, data); data = temp;