Browse Source

Removed dead code.

As we now have separate class for Texture2D and RectangleTexture, this
assertion is no longer needed (expecting the user to be sane).
pull/68/head
Vladimír Vondruš 12 years ago
parent
commit
c2974f5ced
  1. 4
      src/Magnum/AbstractTexture.cpp

4
src/Magnum/AbstractTexture.cpp

@ -1299,10 +1299,6 @@ void AbstractTexture::DataHelper<1>::setWrapping(AbstractTexture& texture, const
#endif #endif
void AbstractTexture::DataHelper<2>::setWrapping(AbstractTexture& texture, const Array2D<Sampler::Wrapping>& wrapping) { void AbstractTexture::DataHelper<2>::setWrapping(AbstractTexture& texture, const Array2D<Sampler::Wrapping>& 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::ClampToBorder)), "Texture2D::setWrapping(): rectangle texture must be clamped to border or to edge", );
#endif
const Implementation::TextureState& state = *Context::current()->state().texture; const Implementation::TextureState& state = *Context::current()->state().texture;
(texture.*state.parameteriImplementation)(GL_TEXTURE_WRAP_S, GLint(wrapping.x())); (texture.*state.parameteriImplementation)(GL_TEXTURE_WRAP_S, GLint(wrapping.x()));

Loading…
Cancel
Save