3add375065
This patch fixed two major problems when we do the color convesion with
GLES2.
1. lack of necessary formats in FBO pool.
GLES2 has three different possible texture formats, GL_RGBA,
GL_BGRA and GL_ALPHA. Previous implementation only has one bucket
for all the three formats which may reuse a incorrect texture format
when do the cache lookup. After this fix, we can enable fbo safely
when running with GLES2.
2. Refine the format matching method in
glamor_get_tex_format_type_from_pictformat.
If both revertion and swap_rb are needed, for example use GL_RGBA
to represent PICT_b8g8r8a8. Then the downloading and uploading should
be handled differently.
The picture's format is PICT_b8g8r8a8,
Then the expecting color layout is as below (little endian):
0 1 2 3 : address
a r g b
Now the in GLES2 the supported color format is GL_RGBA, type is
GL_UNSIGNED_TYPE, then we need to shuffle the fragment
color as :
frag_color = sample(texture).argb;
before we use glReadPixel to get it back.
For the uploading process, the shuffle is a revert shuffle.
We still use GL_RGBA, GL_UNSIGNED_BYTE to upload the color
to a texture, then let's see
0 1 2 3 : address
a r g b : correct colors
R G B A : GL_RGBA with GL_UNSIGNED_BYTE
Now we need to shuffle again, the mapping rule is
r = G, g = B, b = A, a = R. Then the uploading shuffle is as
below:
frag_color = sample(texture).gbar;
After this commit, gles2 version can pass render check with all
the formats except those 1555/2101010.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
147 lines
4.2 KiB
C
147 lines
4.2 KiB
C
/*
|
|
* Copyright © 2009 Intel Corporation
|
|
* Copyright © 1998 Keith Packard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* Zhigang Gong <zhigang.gong@gmail.com>
|
|
*
|
|
*/
|
|
|
|
#include "glamor_priv.h"
|
|
|
|
|
|
static Bool
|
|
_glamor_get_image(DrawablePtr drawable, int x, int y, int w, int h,
|
|
unsigned int format, unsigned long planeMask, char *d,
|
|
Bool fallback)
|
|
{
|
|
PixmapPtr pixmap;
|
|
struct glamor_pixmap_private *pixmap_priv;
|
|
struct glamor_screen_private *glamor_priv;
|
|
int x_off, y_off;
|
|
GLenum tex_format, tex_type;
|
|
int no_alpha, revert;
|
|
glamor_pixmap_fbo *temp_fbo = NULL;
|
|
glamor_gl_dispatch * dispatch;
|
|
Bool ret = FALSE;
|
|
int swap_rb;
|
|
|
|
goto fall_back;
|
|
|
|
glamor_priv = glamor_get_screen_private(drawable->pScreen);
|
|
|
|
if (format != ZPixmap)
|
|
goto fall_back;
|
|
|
|
pixmap = glamor_get_drawable_pixmap(drawable);
|
|
if (!glamor_set_planemask(pixmap, planeMask)) {
|
|
glamor_fallback
|
|
("Failedto set planemask in glamor_solid.\n");
|
|
goto fall_back;
|
|
}
|
|
glamor_priv = glamor_get_screen_private(drawable->pScreen);
|
|
pixmap_priv = glamor_get_pixmap_private(pixmap);
|
|
|
|
|
|
if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(pixmap_priv))
|
|
goto fall_back;
|
|
glamor_get_drawable_deltas(drawable, pixmap, &x_off, &y_off);
|
|
|
|
if (glamor_get_tex_format_type_from_pixmap(pixmap,
|
|
&tex_format,
|
|
&tex_type,
|
|
&no_alpha,
|
|
&revert,
|
|
&swap_rb,
|
|
0)) {
|
|
glamor_fallback("unknown depth. %d \n", drawable->depth);
|
|
goto fall_back;
|
|
}
|
|
|
|
glamor_set_destination_pixmap_priv_nc(pixmap_priv);
|
|
glamor_validate_pixmap(pixmap);
|
|
|
|
if (glamor_priv->gl_flavor == GLAMOR_GL_ES2
|
|
&& ( swap_rb != SWAP_NONE_DOWNLOADING
|
|
|| revert != REVERT_NONE)) {
|
|
/* XXX prepare whole pixmap is not efficient. */
|
|
temp_fbo =
|
|
glamor_es2_pixmap_read_prepare(pixmap, tex_format,
|
|
tex_type, no_alpha,
|
|
revert, swap_rb);
|
|
if (temp_fbo == NULL)
|
|
goto fall_back;
|
|
|
|
}
|
|
|
|
int row_length = PixmapBytePad(w, drawable->depth);
|
|
row_length = (row_length * 8) / drawable->bitsPerPixel;
|
|
|
|
dispatch = glamor_get_dispatch(glamor_priv);
|
|
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
|
|
dispatch->glPixelStorei(GL_PACK_ALIGNMENT, 1);
|
|
dispatch->glPixelStorei(GL_PACK_ROW_LENGTH, row_length);
|
|
} else {
|
|
dispatch->glPixelStorei(GL_PACK_ALIGNMENT, 4);
|
|
}
|
|
|
|
if (glamor_priv->yInverted)
|
|
dispatch->glReadPixels(x + x_off,
|
|
y + y_off,
|
|
w, h,
|
|
tex_format,
|
|
tex_type, d);
|
|
else
|
|
dispatch->glReadPixels(x + x_off,
|
|
pixmap->drawable.height - 1 - (y + y_off),
|
|
w,
|
|
h,
|
|
tex_format,
|
|
tex_type, d);
|
|
glamor_put_dispatch(glamor_priv);
|
|
if (temp_fbo)
|
|
glamor_destroy_fbo(temp_fbo);
|
|
|
|
ret = TRUE;
|
|
|
|
fall_back:
|
|
if (ret == FALSE)
|
|
miGetImage(drawable, x, y, w, h, format, planeMask, d);
|
|
return TRUE;
|
|
}
|
|
|
|
void
|
|
glamor_get_image(DrawablePtr pDrawable, int x, int y, int w, int h,
|
|
unsigned int format, unsigned long planeMask, char *d)
|
|
{
|
|
_glamor_get_image(pDrawable, x, y, w, h, format, planeMask, d, TRUE);
|
|
return;
|
|
}
|
|
|
|
Bool
|
|
glamor_get_image_nf(DrawablePtr pDrawable, int x, int y, int w, int h,
|
|
unsigned int format, unsigned long planeMask, char *d)
|
|
{
|
|
return _glamor_get_image(pDrawable, x, y, w,
|
|
h, format, planeMask, d, FALSE);
|
|
}
|