xserver: Branch 'master'

[Keith Packard]

 glamor/glamor_prepare.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit d3d845ca9e92f0a2ccde93f4242d7769cfe14164
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Sep 25 15:27:22 2014 +0900

    glamor: Use GL_STREAM_READ also for read/write access to a PBO
    
    Otherwise the CPU may end up reading from non-cacheable memory, which is
    very slow.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84178
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
    Reviewed-by: Markus Wick <markus at selfnet.de>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c
index 561c55d..fb85d90 100644
--- a/glamor/glamor_prepare.c
+++ b/glamor/glamor_prepare.c
@@ -84,10 +84,7 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
             if (priv->base.pbo == 0)
                 glGenBuffers(1, &priv->base.pbo);
 
-            if (access == GLAMOR_ACCESS_RW)
-                gl_usage = GL_DYNAMIC_DRAW;
-            else
-                gl_usage = GL_STREAM_READ;
+            gl_usage = GL_STREAM_READ;
 
             glBindBuffer(GL_PIXEL_PACK_BUFFER, priv->base.pbo);
             glBufferData(GL_PIXEL_PACK_BUFFER,