summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2016-01-27 11:26:16 -0800
committerEric Anholt <eric@anholt.net>2016-01-29 18:52:41 -0800
commit2c3e8768443caa66d78775ea79bb16a5faae3a3c (patch)
treeb5d331d155bb8f3e98e08cebe30660dafcd8c50a
parente82c8c81df80de487aa795d69e874a0811c537ea (diff)
downloadxserver-2c3e8768443caa66d78775ea79bb16a5faae3a3c.tar.gz
glamor: Flip around conditionals in RepeatNone fixups.
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--glamor/glamor_render.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index da4592016..73ac831ee 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -110,8 +110,8 @@ glamor_create_composite_fs(struct shader_key *key)
" if (repeat >= RepeatFix) {\n"
" tex = rel_tex_coord(tex, wh, repeat);\n"
" if (repeat == RepeatFix + RepeatNone) {\n"
- " if (!(tex.x >= 0.0 && tex.x < 1.0 && \n"
- " tex.y >= 0.0 && tex.y < 1.0))\n"
+ " if (tex.x < 0.0 || tex.x >= 1.0 || \n"
+ " tex.y < 0.0 || tex.y >= 1.0)\n"
" return vec4(0.0, 0.0, 0.0, 0.0);\n"
" tex = (fract(tex) / wh.xy);\n"
" }\n"