diff options
| author | Juan Linietsky <juan@godotengine.org> | 2019-02-22 11:32:37 -0300 |
|---|---|---|
| committer | Juan Linietsky <juan@godotengine.org> | 2019-02-22 11:35:39 -0300 |
| commit | aab8f443f90df21f84dd306600db0c5d1378ade9 (patch) | |
| tree | 899a0eb0955a95fe1ea2313f386eb889519f9503 /drivers/gles2/rasterizer_canvas_gles2.cpp | |
| parent | 8b9ec8bc8820c0756544ecce45d8e867b7aad17b (diff) | |
| download | redot-engine-aab8f443f90df21f84dd306600db0c5d1378ade9.tar.gz | |
-Support DEPTH_TEXTURE in GLES2, fixes #25106
-Fix use of transparent framebuffers in GLES2
-Fix use of ambient color clearing in GLES2 when no environment exists.
Diffstat (limited to 'drivers/gles2/rasterizer_canvas_gles2.cpp')
| -rw-r--r-- | drivers/gles2/rasterizer_canvas_gles2.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 7d643330cc..9a49d5a7e4 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -115,12 +115,10 @@ void RasterizerCanvasGLES2::canvas_begin() { state.using_transparent_rt = false; if (storage->frame.current_rt) { glBindFramebuffer(GL_FRAMEBUFFER, storage->frame.current_rt->fbo); - glColorMask(1, 1, 1, 1); state.using_transparent_rt = storage->frame.current_rt->flags[RasterizerStorage::RENDER_TARGET_TRANSPARENT]; } if (storage->frame.clear_request) { - glColorMask(true, true, true, true); glClearColor(storage->frame.clear_request_color.r, storage->frame.clear_request_color.g, storage->frame.clear_request_color.b, @@ -129,8 +127,6 @@ void RasterizerCanvasGLES2::canvas_begin() { storage->frame.clear_request = false; } - glColorMask(1, 1, 1, state.using_transparent_rt ? 1 : 0); - /* if (storage->frame.current_rt) { glBindFramebuffer(GL_FRAMEBUFFER, storage->frame.current_rt->fbo); @@ -186,9 +182,6 @@ void RasterizerCanvasGLES2::canvas_end() { state.using_texture_rect = false; state.using_skeleton = false; state.using_ninepatch = false; - if (state.using_transparent_rt) { - glColorMask(1, 1, 1, 1); - } state.using_transparent_rt = false; } @@ -1182,10 +1175,6 @@ void RasterizerCanvasGLES2::_copy_screen(const Rect2 &p_rect) { ERR_FAIL(); } - if (state.using_transparent_rt) { - glColorMask(1, 1, 1, 1); - } - glDisable(GL_BLEND); Vector2 wh(storage->frame.current_rt->width, storage->frame.current_rt->height); @@ -1229,10 +1218,6 @@ void RasterizerCanvasGLES2::_copy_screen(const Rect2 &p_rect) { storage->shaders.copy.set_conditional(CopyShaderGLES2::USE_COPY_SECTION, false); storage->shaders.copy.set_conditional(CopyShaderGLES2::USE_NO_ALPHA, false); - if (state.using_transparent_rt) { - glColorMask(1, 1, 1, 0); - } - glBindFramebuffer(GL_FRAMEBUFFER, storage->frame.current_rt->fbo); //back to front glEnable(GL_BLEND); } |