Merge pull request #17173 from karroffel/gles2-line-rendering-fix

fix GLES2 line rendering
This commit is contained in:
Rémi Verschelde 2018-03-02 13:37:44 +01:00 committed by GitHub
commit 3bab5477ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -405,6 +405,8 @@ void RasterizerCanvasGLES2::_canvas_item_render_commands(Item *p_item, Item *cur
Rect2 dst_rect = Rect2(r->rect.position, r->rect.size); Rect2 dst_rect = Rect2(r->rect.position, r->rect.size);
state.canvas_shader.set_uniform(CanvasShaderGLES2::COLOR_TEXPIXEL_SIZE, texpixel_size);
if (dst_rect.size.width < 0) { if (dst_rect.size.width < 0) {
dst_rect.position.x += dst_rect.size.width; dst_rect.position.x += dst_rect.size.width;
dst_rect.size.width *= -1; dst_rect.size.width *= -1;
@ -633,7 +635,7 @@ void RasterizerCanvasGLES2::_canvas_item_render_commands(Item *p_item, Item *cur
Item::CommandPolygon *polygon = static_cast<Item::CommandPolygon *>(command); Item::CommandPolygon *polygon = static_cast<Item::CommandPolygon *>(command);
state.canvas_shader.set_conditional(CanvasShaderGLES2::USE_TEXTURE_RECT, false); state.canvas_shader.set_conditional(CanvasShaderGLES2::USE_TEXTURE_RECT, false);
state.canvas_shader.set_conditional(CanvasShaderGLES2::USE_UV_ATTRIBUTE, false); state.canvas_shader.set_conditional(CanvasShaderGLES2::USE_UV_ATTRIBUTE, true);
if (state.canvas_shader.bind()) if (state.canvas_shader.bind())
_set_uniforms(); _set_uniforms();