diff options
| author | Keith Packard <keithp@keithp.com> | 2014-04-03 15:35:01 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-04-03 15:35:01 -0700 |
| commit | b4d0bec22c15930abf13a7fb9d684208ccd56b1d (patch) | |
| tree | 0a2b84a89e10e3273306f440baf923053e29a981 /glamor/glamor.c | |
| parent | 3c34dd3603989c0365654ca1b6809395c7f3b169 (diff) | |
| parent | 6e539d8817f738289dc2dea13d0720116287ab9d (diff) | |
Merge remote-tracking branch 'krh/xwayland-for-keithp'
Diffstat (limited to 'glamor/glamor.c')
| -rw-r--r-- | glamor/glamor.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index 59548b77a..2c2d9760c 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -182,7 +182,15 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth, pitch = (((w * pixmap->drawable.bitsPerPixel + 7) / 8) + 3) & ~3; screen->ModifyPixmapHeader(pixmap, w, h, 0, 0, pitch, NULL); - if (type == GLAMOR_MEMORY_MAP || usage == GLAMOR_CREATE_NO_LARGE || + if (usage == GLAMOR_CREATE_PIXMAP_NO_TEXTURE) { + pixmap_priv->type = GLAMOR_TEXTURE_ONLY; + pixmap_priv->base.box.x1 = 0; + pixmap_priv->base.box.y1 = 0; + pixmap_priv->base.box.x2 = w; + pixmap_priv->base.box.y2 = h; + return pixmap; + } + else if (type == GLAMOR_MEMORY_MAP || usage == GLAMOR_CREATE_NO_LARGE || glamor_check_fbo_size(glamor_priv, w, h)) { pixmap_priv->type = type; |