fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-09 13:30:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

glamor: Clarify some logic in RepeatFix handling.

Browse source 
wh ratios are != 1.0 only when large, so with that we can simplify
down how we end up with RepeatFix being used.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 20cb5b2d65)
This commit is contained in:
Eric Anholt 2016-01-27 10:24:17 -08:00 • committed by Adam Jackson
parent d5c9c541c5
commit 12e4e3ac31
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
glamor/glamor_render.c
View file

@ -565,22 +565,15 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit,
* GLES2 doesn't support RepeatNone. We need to fix it anyway.
*
**/
if (repeat_type != RepeatNone)
repeat_type += RepeatFix;
else if (glamor_priv->gl_flavor == GLAMOR_GL_ES2
|| glamor_pixmap_priv_is_large(pixmap_priv)) {
if (picture->transform)
repeat_type += RepeatFix;
}
if (repeat_type >= RepeatFix) {
if (glamor_pixmap_priv_is_large(pixmap_priv) ||
(glamor_priv->gl_flavor == GLAMOR_GL_ES2 && repeat_type == RepeatNone &&
picture->transform)) {
glamor_pixmap_fbo_fix_wh_ratio(wh, pixmap, pixmap_priv);
if ((wh[0] != 1.0 || wh[1] != 1.0)
|| (glamor_priv->gl_flavor == GLAMOR_GL_ES2
&& repeat_type == RepeatFix))
glUniform4fv(wh_location, 1, wh);
else
repeat_type -= RepeatFix;
glUniform4fv(wh_location, 1, wh);
repeat_type += RepeatFix;
}
glUniform1i(repeat_location, repeat_type);
}