[PATCH xserver 00/12] glamor_picture.c total rewrite

[Adam Jackson]

On Mon, 2016-02-01 at 13:58 -0800, Eric Anholt wrote:
> I started incrementally cleaning up glamor_picture.c after being
> surprised by its behavior during the last series, and ended up with a
> total rewrite.  There will be some small losses in acceleration paths
> for GLES2, but since GLES2 hasn't worked in several releases (and a
> bunch of glamor_picture.c on GLES2 started out broken), I don't think
> that's a big deal.  We could get back to acceleration for those paths
> using the converted_format output, if someone cared.
> 
> I tested this with a full xts-render run, the new rendercheck/shmblend
> test I wrote, and I also forced the upload paths to use the GLES2
> cases for a rendercheck/shmblend to make sure I had their swizzles
> right (I didn't).
> 
> Eric Anholt (12):
>   glamor: Simplify temporary picture uploading call stack.
>   glamor: Make sure that GLAMOR_MEMORY pixmaps don't retain an FBO.
>   glamor: Drop dead fbo handling from GLAMORY_MEMORY pict uploads.
>   glamor: Propagate that is_upload is always true.
>   glamor: Merge the two GL-type-from-pictformat paths.
>   glamor: Drop the GLES2 REVERT_UPLOADING_2_10_10_10 paths.
>   glamor: Drop the REVERT_UPLOADING_1_5_5_5 path.
>   glamor: Generalize the a1-to-a8 conversion path.
>   glamor: Drop unused PBO code in temporary picture uploading.
>   glamor: Drop dead large-pixmap handling code in temp picture uploads.
>   glamor: Replace "finish access" shader with texture swizzling.
>   ephyr: Fix redisplay with glamor on GLES.

Merged:

remote: I: patch #72258 updated using rev a96c6d4658e3f386002f96eede660af3b01e5209.
remote: I: patch #72261 updated using rev ee7ca670b1695d64bc12cb37302913acc066a569.
remote: I: patch #72257 updated using rev 1bed5ef2b80c77c1bb9b62971367bea864fd8f66.
remote: I: patch #72256 updated using rev c7574c63c618d3a017105c380542eb04341b04a2.
remote: I: patch #72266 updated using rev f667d5177024d3fdfb1b51694bdaeba6cee67962.
remote: I: patch #72264 updated using rev 2cc7a0815e5e2c2b1b1267cae9c348a8e95b1082.
remote: I: patch #72265 updated using rev 8f1411c3847a742f84ff07c4a0bb610801f5bfee.
remote: I: patch #72267 updated using rev 6112fecc3a4fd7dfb0ef77a98cfd1f7c91ccea0c.
remote: I: patch #72260 updated using rev 094b1bea8bd08eec029e4d61ba40d81441c37905.
remote: I: patch #72263 updated using rev b0cc04992ced5d96bb5c52fc1e5c868797cc0a17.
remote: I: patch #72259 updated using rev 0b4c0c75d06f3dbe92be1a26a637e9f05529cb3d.
remote: I: patch #72262 updated using rev c01094c5312fbd84146dd83122e5256a8e57d092.
remote: I: 12 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   25ce263..c01094c  master -> master

- ajax