frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Use GL_MESA_pack_invert to avoid complexity in prepare_access.

This commit is contained in:
Eric Anholt 2010-02-08 11:58:52 +01:00 committed by Zhigang Gong
parent e9d4794cd0
commit 72a757ba00
1 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
glamor/glamor_core.c
View File

@ -293,25 +293,24 @@ glamor_prepare_access(DrawablePtr drawable, glamor_access_t access)
return TRUE; return TRUE;
} }
stride = PixmapBytePad(drawable->width, drawable->depth); stride = PixmapBytePad(pixmap->drawable.width, drawable->depth);
read_stride = stride; read_stride = stride;
data = xalloc(stride * drawable->height); data = xalloc(stride * pixmap->drawable.height);
switch (drawable->depth) { switch (drawable->depth) {
case 1: case 1:
format = GL_ALPHA; format = GL_ALPHA;
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
read_stride = drawable->width; read_stride = pixmap->drawable.width;
break; break;
case 8: case 8:
format = GL_ALPHA; format = GL_ALPHA;
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
break; break;
case 24: case 24:
format = GL_RGB; assert(drawable->bitsPerPixel == 32);
type = GL_UNSIGNED_BYTE; /* FALLTHROUGH */
break;
case 32: case 32:
format = GL_BGRA; format = GL_BGRA;
type = GL_UNSIGNED_INT_8_8_8_8_REV; type = GL_UNSIGNED_INT_8_8_8_8_REV;
@ -323,15 +322,22 @@ glamor_prepare_access(DrawablePtr drawable, glamor_access_t access)
} }
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, pixmap_priv->fb); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, pixmap_priv->fb);
glPixelStorei(GL_PACK_ALIGNMENT, 1);
glPixelStorei(GL_PACK_ROW_LENGTH, read_stride * 8 /
pixmap->drawable.bitsPerPixel);
if (GLEW_MESA_pack_invert && drawable->depth != 1) {
glPixelStorei(GL_PACK_INVERT_MESA, 1);
glReadPixels(0, 0,
pixmap->drawable.width, pixmap->drawable.height,
format, type, data);
glPixelStorei(GL_PACK_INVERT_MESA, 0);
} else {
glGenBuffersARB(1, &pixmap_priv->pbo); glGenBuffersARB(1, &pixmap_priv->pbo);
glBindBufferARB(GL_PIXEL_PACK_BUFFER_EXT, pixmap_priv->pbo); glBindBufferARB(GL_PIXEL_PACK_BUFFER_EXT, pixmap_priv->pbo);
glBufferDataARB(GL_PIXEL_PACK_BUFFER_EXT, glBufferDataARB(GL_PIXEL_PACK_BUFFER_EXT,
read_stride * pixmap->drawable.height, read_stride * pixmap->drawable.height,
NULL, GL_DYNAMIC_DRAW_ARB); NULL, GL_DYNAMIC_DRAW_ARB);
glPixelStorei(GL_PACK_ALIGNMENT, 1);
glPixelStorei(GL_PACK_ROW_LENGTH, read_stride * 8 /
pixmap->drawable.bitsPerPixel);
glReadPixels(0, 0, glReadPixels(0, 0,
pixmap->drawable.width, pixmap->drawable.height, pixmap->drawable.width, pixmap->drawable.height,
format, type, 0); format, type, 0);
@ -340,8 +346,8 @@ glamor_prepare_access(DrawablePtr drawable, glamor_access_t access)
if (pixmap->drawable.depth == 1) { if (pixmap->drawable.depth == 1) {
for (y = 0; y < pixmap->drawable.height; y++) { for (y = 0; y < pixmap->drawable.height; y++) {
uint8_t *read_row = read + read_stride * (pixmap->drawable.height - uint8_t *read_row = read +
y - 1); read_stride * (pixmap->drawable.height - y - 1);
for (x = 0; x < pixmap->drawable.width; x++) { for (x = 0; x < pixmap->drawable.width; x++) {
int index = x / 8; int index = x / 8;
@ -358,12 +364,13 @@ glamor_prepare_access(DrawablePtr drawable, glamor_access_t access)
memcpy(data + y * stride, memcpy(data + y * stride,
read + (pixmap->drawable.height - y - 1) * stride, stride); read + (pixmap->drawable.height - y - 1) * stride, stride);
} }
pixmap->devPrivate.ptr = data;
glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_EXT); glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_EXT);
glBindBufferARB(GL_PIXEL_PACK_BUFFER_EXT, 0); glBindBufferARB(GL_PIXEL_PACK_BUFFER_EXT, 0);
glDeleteBuffersARB(1, &pixmap_priv->pbo); glDeleteBuffersARB(1, &pixmap_priv->pbo);
pixmap_priv->pbo = 0; pixmap_priv->pbo = 0;
}
pixmap->devPrivate.ptr = data;
return TRUE; return TRUE;
} }
@ -397,9 +404,8 @@ glamor_finish_access(DrawablePtr drawable)
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
break; break;
case 24: case 24:
format = GL_RGB; assert(drawable->bitsPerPixel == 32);
type = GL_UNSIGNED_BYTE; /* FALLTHROUGH */
break;
case 32: case 32:
format = GL_BGRA; format = GL_BGRA;
type = GL_UNSIGNED_INT_8_8_8_8_REV; type = GL_UNSIGNED_INT_8_8_8_8_REV;
@ -409,7 +415,7 @@ glamor_finish_access(DrawablePtr drawable)
return; return;
} }
stride = PixmapBytePad(drawable->width, drawable->depth); stride = PixmapBytePad(pixmap->drawable.width, drawable->depth);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, pixmap_priv->fb); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, pixmap_priv->fb);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);