[PULL] glamor-next

[Keith Packard]

Eric Anholt <eric at anholt.net> writes:

> Adam Jackson (1):
>       glamor: Fix up indentation
>
> Eric Anholt (3):
>       glamor: Just set the logic op to what we want at the start of all rendering.
>       glamor: Don't optimize out scissor updates in CopyArea.
>       glamor: Add a helper function for the common GL_QUADS fallback pattern.
>
> Jon TURNEY (2):
>       glamor: Fix build when configured --enable-glamor --disable-xshmfence
>       ephyr: Avoid a segfault with 'DISPLAY= Xephyr -glamor'
>
> Keith Packard (13):
>       glamor: Eliminate GLAMOR_CREATE_PIXMAP_MAP and GLAMOR_MEMORY_MAP
>       glamor: Eliminate GLAMOR_USE_SCREEN and GLAMOR_USE_PICTURE_SCREEN
>       glamor: Remove _nf rendering functions
>       glamor: Remove ddx fallback check functions
>       glamor: Eliminate GLAMOR_SEPARATE_TEXTURE pixmap type
>       glamor: Eliminate GLAMOR_TEXTURE_PACK pixmap type
>       glamor: Remove remaining support for FBOs not matching pixmap size
>       glamor: Remove screen private and pixmap ptrs from pixmap private and fbo
>       glamor: Remove unused glamor_pixmap_private_atlas_t
>       glamor: Eliminate separate 'large' pixmap private structure
>       glamor: Create inline tests for small/large pixmaps
>       glamor: Eliminate GLAMOR_TEXTURE_LARGE pixmap type
>       glamor: * 1/size is faster than / size in VS
>
> Maarten Lankhorst (4):
>       glamor: only use (un)pack_subimage when available
>       glamor: do not check for gl errors in glamor_build_program
>       glamor: Use GL_FRAMEBUFFER instead of GL_READ_FRAMEBUFFER
>       glamor: GL_TEXTURE_MAX_LEVEL is not available on GLES2
>
> Matt Turner (1):
>       glamor: Perform texture2D() separately from swizzle.
>
> Olivier Fourdan (3):
>       ephyr: Fail if glamor is requested but not usable
>       xwayland: Add dependency on glamor libs
>       glamor: check max native ALU instructions

Merged.
   95e83ff..7088816  master -> master

-- 
-keith
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20150327/6fefd914/attachment.sig>