diff options
| author | Thomas Herzog <thomas.herzog@mail.com> | 2018-07-27 16:31:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 16:31:10 +0200 |
| commit | c7dc066dc180149652006e86f07765e5326f324b (patch) | |
| tree | ce2df74bd0cec34de844a9574b4f071204c924c6 /drivers/gles2/rasterizer_gles2.cpp | |
| parent | 936b5a395a4bd80fbb2832ff175efbde844e5fde (diff) | |
| parent | b64171e79cb8de3e7cc5b79352a4cb711347918c (diff) | |
| download | redot-engine-c7dc066dc180149652006e86f07765e5326f324b.tar.gz | |
Merge pull request #20512 from karroffel/gles2-pr
add initial GLES2 3D renderer
Diffstat (limited to 'drivers/gles2/rasterizer_gles2.cpp')
| -rw-r--r-- | drivers/gles2/rasterizer_gles2.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 5de1d5f1dc..335ad28670 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -348,10 +348,10 @@ void RasterizerGLES2::blit_render_target_to_screen(RID p_render_target, const Re 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(); canvas->canvas_begin(); - canvas->state.canvas_shader.set_uniform(CanvasShaderGLES2::BLIT_PASS, true); glDisable(GL_BLEND); glBindFramebuffer(GL_FRAMEBUFFER, RasterizerStorageGLES2::system_fbo); glActiveTexture(GL_TEXTURE0); @@ -361,8 +361,6 @@ void RasterizerGLES2::blit_render_target_to_screen(RID p_render_target, const Re canvas->draw_generic_textured_rect(p_screen_rect, Rect2(0, 0, 1, -1)); - canvas->state.canvas_shader.set_uniform(CanvasShaderGLES2::BLIT_PASS, false); - glBindTexture(GL_TEXTURE_2D, 0); canvas->canvas_end(); } |