Merge pull request #14755 from hpvb/fix-13337

Don't glBindTexture() on viewports without effects
This commit is contained in:
Rémi Verschelde 2017-12-17 14:19:36 +01:00 committed by GitHub
commit e2583233d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1545,7 +1545,7 @@ void RasterizerCanvasGLES3::reset_canvas() {
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
//use for reading from screen
if (storage->frame.current_rt) {
if (storage->frame.current_rt && !storage->frame.current_rt->flags[RasterizerStorage::RENDER_TARGET_NO_SAMPLING]) {
glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 3);
glBindTexture(GL_TEXTURE_2D, storage->frame.current_rt->effects.mip_maps[0].color);
}