glamor: Changes to 'master'
Alex Deucher
agd5f at kemper.freedesktop.org
Mon Jun 9 19:52:55 PDT 2014
src/glamor.c | 10 ++-----
src/glamor_copyarea.c | 1
src/glamor_core.c | 2 -
src/glamor_fill.c | 1
src/glamor_glyphblt.c | 2 -
src/glamor_gradient.c | 56 +++----------------------------------------
src/glamor_pixmap.c | 2 -
src/glamor_priv.h | 2 +
src/glamor_render.c | 11 +++++++-
src/glamor_tile.c | 2 -
src/glamor_trapezoid.c | 6 ----
src/glamor_vbo.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++-
src/glamor_xv.c | 2 -
13 files changed, 83 insertions(+), 77 deletions(-)
New commits:
commit 081a53703128d8aa2368856bab289759c593ccff
Author: Grigori Goronzy <greg at chown.ath.cx>
Date: Fri Jun 6 11:51:01 2014 +0200
xv: workaround corruption
Keeping the video pixmaps persistent sometimes will lead to video
corruption (shifted chroma planes) for unknown reasons. Possibly
there are some subtle pixmap handling bugs in xv or other parts of
the glamor code. To workaround, simply destroy pixmaps after they
have been used once.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72821
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
commit 394d0c412626bd23eca1d936fae97b6dccbffcff
Author: Eric Anholt <eric at anholt.net>
Date: Fri Jun 6 21:20:59 2014 +0200
glamor: Fix typo in setting v_position's attrib location.
Assuming it was the first attribute assigned by the GL, it would have
ended up with location 0 anyway.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
commit b20c74ff2a78649b6d7a692658e14c6f421493a5
Author: Markus Wick <markus at selfnet.de>
Date: Fri Jun 6 21:20:58 2014 +0200
glamor: don't reset the GLSL program
We don't use fixed function rendering, so there is no need to reset
the program at all. This lets the driver avoid checking for state
changes between draw calls when we rebind the same program.
Improves xephyr x11perf -f8text performance by 6.03062% +/- 1.64928%
(n=20)
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
commit 883ae5886d1db26ba1ae270aa07219896f33c70f
Author: Markus Wick <markus at selfnet.de>
Date: Fri Jun 6 21:20:57 2014 +0200
glamor: Use glsl "fract/mod" instead of "while" in gradient shaders.
This fixes gtkperf. It seemed to hang forever.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
commit ecf6ce02d673780583efc338b6501c15fae18169
Author: Eric Anholt <eric at anholt.net>
Date: Fri Jun 6 21:20:56 2014 +0200
glamor: Fix accelerated rendering of GTK's ARGB vs xBGR composites.
There is some complicated code to support tweaking the format as we
upload from a SHM pixmap (aka the GTK icon cache), but if we weren't
sourcing from a SHM pixmap we just forgot to check that the formats
matched at all.
We could potentially be a little more discerning here (xRGB source and
ARGB mask would be fine, for example), but this will all change with
texture views anyway, so just get the rendering working for 1.16
release.
Fixes the new rendercheck gtk_argb_xbgr test.
v2: Squash in keithp's fix for checking that we have a non-NULL
pixmap, and reword the comment even more.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
commit 18c2ff6245fd80fbc1b7f0b12ff17bf8b969d9fd
Author: Grigori Goronzy <greg at chown.ath.cx>
Date: Thu Jun 5 17:38:23 2014 +0200
vbo: Raise VBO size
This reduces CPU overhead due to buffer orphaning, which results in
a small overall performance improvement.
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
commit 387f6a6351855cc3f1b57582932608b7e7a96e9d
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jun 5 17:38:22 2014 +0200
glamor: Use buffer_storage
29.5361% +/- 2.74092% improvement in x11perf -aa10text (n=489).
Pulled from Eric's xserver glamor tree.
v2: Fix fallback, return correct buffer offset, map whole buffer,
unmap conditionally.
v3: add conditional defines to make it compile with outdated headers.
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Signed-off-by: Grigori Goronzy <greg at chown.ath.cx>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
commit 0fe45a489b33ab72a1811dc8492eb41950ad7253
Author: Samuel Li <samuel.li at amd.com>
Date: Tue Mar 18 12:28:50 2014 -0400
glamor: Revert a context related change. It caused a compilation error since context switcher related changes have not been pulled into this tree. This reverts commit 73ab7f4.
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
More information about the xorg-commit
mailing list