summaryrefslogtreecommitdiff
path: root/drivers/gles2/rasterizer_gles2.cpp
diff options
context:
space:
mode:
authorThomas Herzog <thomas.herzog@mail.com>2018-08-18 18:37:52 +0200
committerGitHub <noreply@github.com>2018-08-18 18:37:52 +0200
commitb4ce1e3005ed54f028b57bbf6908f60113afe80a (patch)
treed7f8214192ec9b3da40eb3ecfbfe54a2b475a8e1 /drivers/gles2/rasterizer_gles2.cpp
parentff8e6f920cd99954c3394412713950c1195199f2 (diff)
parentf55039b194bbbd8d797b667d67e5677fb429d356 (diff)
Merge pull request #20965 from dragmz/gles2_batching
Batch GLES2 draw calls
Diffstat (limited to 'drivers/gles2/rasterizer_gles2.cpp')
-rw-r--r--drivers/gles2/rasterizer_gles2.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp
index a1a0b9e2c6..165ffc0412 100644
--- a/drivers/gles2/rasterizer_gles2.cpp
+++ b/drivers/gles2/rasterizer_gles2.cpp
@@ -345,9 +345,6 @@ void RasterizerGLES2::blit_render_target_to_screen(RID p_render_target, const Re
RasterizerStorageGLES2::RenderTarget *rt = storage->render_target_owner.getornull(p_render_target);
ERR_FAIL_COND(!rt);
- canvas->state.canvas_shader.set_conditional(CanvasShaderGLES2::USE_TEXTURE_RECT, true);
- canvas->state.canvas_shader.set_conditional(CanvasShaderGLES2::USE_UV_ATTRIBUTE, false);
-
canvas->state.canvas_shader.set_custom_shader(0);
canvas->state.canvas_shader.bind();
@@ -359,7 +356,7 @@ void RasterizerGLES2::blit_render_target_to_screen(RID p_render_target, const Re
// TODO normals
- canvas->draw_generic_textured_rect(p_screen_rect, Rect2(0, 0, 1, -1));
+ canvas->draw_generic_textured_rect(p_screen_rect, Rect2(0, 1, 1, -1));
glBindTexture(GL_TEXTURE_2D, 0);
canvas->canvas_end();