diff options
Diffstat (limited to 'xorg-server/glamor')
-rw-r--r-- | xorg-server/glamor/glamor_pixmap.c | 1 | ||||
-rw-r--r-- | xorg-server/glamor/glamor_prepare.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/glamor/glamor_pixmap.c b/xorg-server/glamor/glamor_pixmap.c index 11e9ebb00..355fe4b57 100644 --- a/xorg-server/glamor/glamor_pixmap.c +++ b/xorg-server/glamor/glamor_pixmap.c @@ -774,6 +774,7 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format, return FALSE; bits = glamor_color_convert_to_bits(bits, converted_bits, w, h, stride, no_alpha, revert, swap_rb); + free(converted_bits); if (bits == NULL) { ErrorF("Failed to convert pixmap no_alpha %d," "revert mode %d, swap mode %d\n", no_alpha, revert, swap_rb); diff --git a/xorg-server/glamor/glamor_prepare.c b/xorg-server/glamor/glamor_prepare.c index 561c55d19..fb85d9082 100644 --- a/xorg-server/glamor/glamor_prepare.c +++ b/xorg-server/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, |