glamor: We don't need to check format in compositing.
We already handle all format checking in pixmap uploading and converting, don't need to do that again. Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
parent
477a54bc9e
commit
77ecd36693
|
@ -501,53 +501,6 @@ glamor_composite_with_copy(CARD8 op,
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Bool
|
|
||||||
good_source_format(PicturePtr picture)
|
|
||||||
{
|
|
||||||
switch (picture->format) {
|
|
||||||
case PICT_a1:
|
|
||||||
case PICT_a8:
|
|
||||||
case PICT_a8r8g8b8:
|
|
||||||
case PICT_x8r8g8b8:
|
|
||||||
return TRUE;
|
|
||||||
default:
|
|
||||||
return TRUE;
|
|
||||||
glamor_fallback("Bad source format 0x%08x\n", picture->format);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static Bool
|
|
||||||
good_mask_format(PicturePtr picture)
|
|
||||||
{
|
|
||||||
switch (picture->format) {
|
|
||||||
case PICT_a1:
|
|
||||||
case PICT_a8:
|
|
||||||
case PICT_a8r8g8b8:
|
|
||||||
case PICT_x8r8g8b8:
|
|
||||||
return TRUE;
|
|
||||||
default:
|
|
||||||
return TRUE;
|
|
||||||
glamor_fallback("Bad mask format 0x%08x\n", picture->format);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static Bool
|
|
||||||
good_dest_format(PicturePtr picture)
|
|
||||||
{
|
|
||||||
switch (picture->format) {
|
|
||||||
case PICT_a8:
|
|
||||||
case PICT_a8r8g8b8:
|
|
||||||
case PICT_x8r8g8b8:
|
|
||||||
return TRUE;
|
|
||||||
default:
|
|
||||||
return TRUE;
|
|
||||||
glamor_fallback("Bad dest format 0x%08x\n", picture->format);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
glamor_setup_composite_vbo(ScreenPtr screen)
|
glamor_setup_composite_vbo(ScreenPtr screen)
|
||||||
{
|
{
|
||||||
|
@ -815,10 +768,6 @@ glamor_composite_with_shader(CARD8 op,
|
||||||
goto fail;
|
goto fail;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
if ((source_status != GLAMOR_UPLOAD_PENDING)
|
|
||||||
&& !good_source_format(source)) {
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (key.mask == SHADER_MASK_TEXTURE ||
|
if (key.mask == SHADER_MASK_TEXTURE ||
|
||||||
key.mask == SHADER_MASK_TEXTURE_ALPHA) {
|
key.mask == SHADER_MASK_TEXTURE_ALPHA) {
|
||||||
|
@ -836,13 +785,6 @@ glamor_composite_with_shader(CARD8 op,
|
||||||
goto fail;
|
goto fail;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
if ((mask_status != GLAMOR_UPLOAD_PENDING)
|
|
||||||
&& !good_mask_format(mask)) {
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!good_dest_format(dest)) {
|
|
||||||
goto fail;
|
|
||||||
}
|
}
|
||||||
#ifdef GLAMOR_PIXMAP_DYNAMIC_UPLOAD
|
#ifdef GLAMOR_PIXMAP_DYNAMIC_UPLOAD
|
||||||
if (source_status == GLAMOR_UPLOAD_PENDING
|
if (source_status == GLAMOR_UPLOAD_PENDING
|
||||||
|
|
Loading…
Reference in New Issue
Block a user