andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glamor: Move the blend set up after the pixmap uploading.

Browse Source 
This is a bug, as if we do blend set up before do the pixmap
dynamic uploading. We will have a incorrect blend env when
doing the uploading.

Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
This commit is contained in:
Zhigang Gong 2011-06-26 15:54:24 +08:00 committed by Zhigang Gong
parent bf78228337
commit b8e692d94e
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glamor/glamor_render.c
View File

@ -734,7 +734,7 @@ glamor_composite_with_shader(CARD8 op,
int mask_x_off, mask_y_off;
enum glamor_pixmap_status source_status = GLAMOR_NONE;
enum glamor_pixmap_status mask_status = GLAMOR_NONE;
PictFormatShort saved_source_format = 0;
PictFormatShort saved_source_format = 0;
float src_matrix[9], mask_matrix[9];
dest_pixmap_priv = glamor_get_pixmap_private(dest_pixmap);
@ -838,10 +838,6 @@ glamor_composite_with_shader(CARD8 op,
if (!good_dest_format(dest)) {
goto fail;
}
if (!glamor_set_composite_op(screen, op, dest, mask)) {
goto fail;
}
#ifdef GLAMOR_PIXMAP_DYNAMIC_UPLOAD
if (source_status == GLAMOR_UPLOAD_PENDING
&& mask_status == GLAMOR_UPLOAD_PENDING
@ -849,17 +845,13 @@ glamor_composite_with_shader(CARD8 op,
if (source->format != mask->format) {
saved_source_format = source->format;
/* XXX
* when need to flip the texture and mask and source share the same pixmap,
* there is a bug, need to be fixed. *
*/
if (!glamor_priv->yInverted)
goto fail;
if (!combine_pict_format(&source->format, source->format, mask->format, key.in)) {
glamor_fallback("combine source %x mask %x failed.\n",
source->format, mask->format);
goto fail;
}
if (source->format != saved_source_format) {
glamor_picture_format_fixup(source, source_pixmap_priv);
}
@ -913,7 +905,9 @@ glamor_composite_with_shader(CARD8 op,
}
}
#endif
if (!glamor_set_composite_op(screen, op, dest, mask)) {
goto fail;
}
glamor_set_destination_pixmap_priv_nc(dest_pixmap_priv);
shader = glamor_lookup_composite_shader(screen, &key);