From 7fe926dcabf017f892d1b304382c447fdf9f55e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 29 Dec 2013 00:49:54 +0100 Subject: [PATCH] Fix AbstractTexture::setWrapping() for rectangle textures. Sampler::Wrapping::ClampToBorder was mistakenly disallowed. All the tests are now passing again. --- src/AbstractTexture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AbstractTexture.cpp b/src/AbstractTexture.cpp index cae7d7049..bdf8edd0c 100644 --- a/src/AbstractTexture.cpp +++ b/src/AbstractTexture.cpp @@ -1107,7 +1107,7 @@ void AbstractTexture::DataHelper<3>::setSubImage(AbstractTexture* const texture, void AbstractTexture::DataHelper<2>::setWrapping(AbstractTexture* texture, const Array2D& wrapping) { #ifndef MAGNUM_TARGET_GLES - CORRADE_ASSERT(texture->_target != GL_TEXTURE_RECTANGLE || ((wrapping.x() == Sampler::Wrapping::ClampToEdge || wrapping.x() == Sampler::Wrapping::ClampToBorder) && (wrapping.y() == Sampler::Wrapping::ClampToEdge || wrapping.y() == Sampler::Wrapping::ClampToEdge)), "AbstractTexture: rectangle texture wrapping must either clamp to border or to edge", ); + CORRADE_ASSERT(texture->_target != GL_TEXTURE_RECTANGLE || ((wrapping.x() == Sampler::Wrapping::ClampToEdge || wrapping.x() == Sampler::Wrapping::ClampToBorder) && (wrapping.y() == Sampler::Wrapping::ClampToEdge || wrapping.y() == Sampler::Wrapping::ClampToBorder)), "Texture2D::setWrapping(): rectangle texture must be clamped to border or to edge", ); #endif (texture->*parameteriImplementation)(GL_TEXTURE_WRAP_S, GLint(wrapping.x()));