glamor: Changes to 'master'

Alex Deucher agd5f at kemper.freedesktop.org
Thu Feb 6 09:17:37 PST 2014


 src/glamor_copyarea.c |   55 ++++++++++++++++++++++++++++++++++++--------------
 src/glamor_pixmap.c   |   20 +++++++++++++-----
 src/glamor_putimage.c |    8 +++----
 src/glamor_utils.h    |   20 ++++++++++++++++++
 4 files changed, 79 insertions(+), 24 deletions(-)

New commits:
commit e734e1b621c03aeb1c7ba6b2485b7e71c8b008b6
Author: Samuel Li <samuel.li at amd.com>
Date:   Tue Feb 4 18:52:50 2014 -0500

    glamor: Fall back for unsupported picture format.
    
    This fixes seg fault when running x11perf -aa4trap300.
    
    Signed-off-by: Samuel Li <samuel.li at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

commit 6ffa4b88be5ac1580d29193b6cd3d216415d9be2
Author: Anthony Waters <awaters1 at gmail.com>
Date:   Wed Jan 29 11:21:14 2014 -0500

    glamor: Added in an optimization to copy area that uploads the data directly to the destination similar to what EXA did
    
    For instances where the destination has a FBO but the source doesn't,
    the code now just puts the data that was in source directly into
    destination through glamor_upload_sub_pixmap_to_texture.  This is the
    same way that EXA works in this case as well.
    
    Bug:
    https://bugs.freedesktop.org/show_bug.cgi?id=71813
    Signed-off-by: Anthony Waters <awaters1 at gmail.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

commit 654e1536a6d6539dcc30d9151122536c1807f34a
Author: Anthony Waters <awaters1 at gmail.com>
Date:   Wed Jan 29 11:21:13 2014 -0500

    glamor: Add in support for the stride parameter when uploading texture data
    
    The method __glamor_upload_pixmap_to_texture was updated to support a
    stride parameter for the data being uploaded to a texture.  This
    required correctly setting the alignment from 4 to a value based on the
    depth of the data and also required setting GL_UNPACK_ROW_LENGTH based
    on both the stride and the alignment.
    
    The stride parameter was also updated in glamor_put_image to be
    correctly specified, the old values would cause the xserver to crash.
    
    Part of bug:
    https://bugs.freedesktop.org/show_bug.cgi?id=71813
    
    Signed-off-by: Anthony Waters <awaters1 at gmail.com>
    Signed-off-by: Alex Deucher <alexander.deucher at amd.com>



More information about the xorg-commit mailing list