diff options
| author | Grigori Goronzy <greg@chown.ath.cx> | 2013-10-02 00:37:57 +0200 |
|---|---|---|
| committer | root <root@gongzg-ivb> | 2013-10-08 15:52:25 +0800 |
| commit | ba209eeef20b210ba95e4c8bbe0f84b83589d5b5 (patch) | |
| tree | 1c38b0bf27486c3df96b4ec92721ec046ed12230 | |
| parent | 773bf99a078207cc7c796d5dd33cccfcfe727ff1 (diff) | |
glamor_render: fix PictFilters
Add Fast/Good/Best and appropriately map to Nearest and
Bilinear. Additionally, add a fallback path for unsupported filters.
Notably, this fixes window shadow rendering with Compiz, which uses
PictFilterConvolution for some odd reason.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
| -rw-r--r-- | src/glamor_render.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/glamor_render.c b/src/glamor_render.c index ca8e509..76a571f 100644 --- a/src/glamor_render.c +++ b/src/glamor_render.c @@ -568,6 +568,7 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit, switch (picture->filter) { default: + case PictFilterFast: case PictFilterNearest: dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, @@ -576,6 +577,8 @@ glamor_set_composite_texture(glamor_screen_private *glamor_priv, int unit, GL_TEXTURE_MAG_FILTER, GL_NEAREST); break; + case PictFilterGood: + case PictFilterBest: case PictFilterBilinear: dispatch->glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, @@ -1771,6 +1774,12 @@ _glamor_composite(CARD8 op, } } + if ((source && source->filter >= PictFilterConvolution) + || (mask && mask->filter >= PictFilterConvolution)) { + glamor_fallback("glamor_composite(): unsupported filter\n"); + goto fail; + } + if (!miComputeCompositeRegion(®ion, source, mask, dest, x_source + (source_pixmap ? source->pDrawable->x : 0), |