diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-17 14:19:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-17 14:19:36 +0100 |
| commit | e2583233d151c235e9d25a43a0c0d179d9a8fd10 (patch) | |
| tree | d5586dc5cfb52bfdb954a6bebff0f66d5e108fb2 /drivers | |
| parent | fc0e341fc5948fae608d4e2c589cc116542fa392 (diff) | |
| parent | 34991af55322c499eb407d5492c8d49dec84ea40 (diff) | |
Merge pull request #14755 from hpvb/fix-13337
Don't glBindTexture() on viewports without effects
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_canvas_gles3.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 309497c938..5d93c6a982 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -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); } |