diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-08-07 11:56:49 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-08-07 11:56:49 +0200 |
| commit | 577ff3ce922e457cc32f80d4365cb1da81552e72 (patch) | |
| tree | a9da374fb991bb23ecb04f0a0c6bd50626411a2c | |
| parent | e755fa56d03aa338d0c6345ed41e32aa3115ad4b (diff) | |
Add support for EXA_MIXED_PIXMAPS in xserver master.
| -rw-r--r-- | src/radeon_dri2.c | 2 | ||||
| -rw-r--r-- | src/radeon_exa_funcs.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c index 08da996a..9c862449 100644 --- a/src/radeon_dri2.c +++ b/src/radeon_dri2.c @@ -98,6 +98,7 @@ radeon_dri2_create_buffers(DrawablePtr drawable, if (attachments[i] == DRI2BufferDepth) { depth_pixmap = pixmap; } + exaMoveInPixmap(pixmap); driver_priv = exaGetPixmapDriverPrivate(pixmap); r = radeon_gem_get_kernel_name(driver_priv->bo, &buffers[i].name); if (r) @@ -159,6 +160,7 @@ radeon_dri2_create_buffer(DrawablePtr drawable, if (attachment == DRI2BufferDepth) { depth_pixmap = pixmap; } + exaMoveInPixmap(pixmap); driver_priv = exaGetPixmapDriverPrivate(pixmap); r = radeon_gem_get_kernel_name(driver_priv->bo, &buffers->name); if (r) diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index dc56c55a..599084f2 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -735,8 +735,12 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) info->accel_state->exa->pixmapPitchAlign = 64; #ifdef EXA_HANDLES_PIXMAPS - if (info->cs) + if (info->cs) { info->accel_state->exa->flags |= EXA_HANDLES_PIXMAPS; +#ifdef EXA_MIXED_PIXMAPS + info->accel_state->exa->flags |= EXA_MIXED_PIXMAPS; +#endif + } #endif #ifdef RENDER |