diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-12-19 14:50:57 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 14:50:57 -0300 |
| commit | 0a6a0086d87cc0cca19155a49c3157c8dbce1dab (patch) | |
| tree | cd76778dbd987f19f863a93e76d2cf31c1c92ce6 /drivers | |
| parent | f66507e072e7dc80a1e69ce1bac73bdcd780b626 (diff) | |
| parent | ffe827ab5a25ee033dbea2374fd93b84bebc0788 (diff) | |
Merge pull request #14834 from guilhermefelipecgs/fix_pixel_snap
Fix pixel snap not being used in 3.0
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/rasterizer_canvas_gles3.cpp | 2 | ||||
| -rw-r--r-- | drivers/gles3/shaders/canvas.glsl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 5d93c6a982..a4daa77b50 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -1784,6 +1784,8 @@ void RasterizerCanvasGLES3::initialize() { state.canvas_shader.set_conditional(CanvasShaderGLES3::USE_RGBA_SHADOWS, storage->config.use_rgba_2d_shadows); state.canvas_shadow_shader.set_conditional(CanvasShadowShaderGLES3::USE_RGBA_SHADOWS, storage->config.use_rgba_2d_shadows); + + state.canvas_shader.set_conditional(CanvasShaderGLES3::USE_PIXEL_SNAP, GLOBAL_DEF("rendering/quality/2d/use_pixel_snap", false)); } void RasterizerCanvasGLES3::finalize() { diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index 4bbb18ce42..0b8230234b 100644 --- a/drivers/gles3/shaders/canvas.glsl +++ b/drivers/gles3/shaders/canvas.glsl @@ -171,7 +171,7 @@ VERTEX_SHADER_CODE #ifdef USE_PIXEL_SNAP - outvec.xy=floor(outvec+0.5); + outvec.xy=floor(outvec+0.5).xy; #endif |