Browse Source

GL: make *Texture::unbindImage() work on ARM Mali.

Easy to fix, but the format should not matter in this case at all.
pull/331/head
Vladimír Vondruš 7 years ago
parent
commit
36a3f32d64
  1. 5
      doc/changelog.dox
  2. 2
      src/Magnum/GL/AbstractTexture.cpp

5
doc/changelog.dox

@ -168,6 +168,11 @@ See also:
callback is called from the same thread as the one with the corresponding callback is called from the same thread as the one with the corresponding
GL context (which is the case on Mesa AMD drivers). The documentation was GL context (which is the case on Mesa AMD drivers). The documentation was
updated to reflect that as well. updated to reflect that as well.
- @ref GL::AbstractTexture::unbindImage() "GL::*Texture::unbindImage()" now
uses a RGBA format instead of a single-channel format because
@ref GL::Context::DetectedDriver::ArmMali "ARM Mali" drivers complain about
R8 not being renderable (even though the format shouldn't matter when
unbinding a texture)
@subsubsection changelog-latest-changes-math Math library @subsubsection changelog-latest-changes-math Math library

2
src/Magnum/GL/AbstractTexture.cpp

@ -282,7 +282,7 @@ void AbstractTexture::unbindImage(const Int imageUnit) {
/* Update state tracker, bind the texture to the unit */ /* Update state tracker, bind the texture to the unit */
std::get<0>(textureState.imageBindings[imageUnit]) = 0; std::get<0>(textureState.imageBindings[imageUnit]) = 0;
glBindImageTexture(imageUnit, 0, 0, false, 0, GL_READ_ONLY, GL_R8); glBindImageTexture(imageUnit, 0, 0, false, 0, GL_READ_ONLY, GL_RGBA8);
} }
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES

Loading…
Cancel
Save