diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-16 15:26:55 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-23 11:02:20 +0100 |
| commit | 43a34186d13d29c671431832469ca5301751b3cf (patch) | |
| tree | 8ff14d5420c3ce91bc0322a4c21ab9d03fa95f3c /src/i915_render.c | |
| parent | 9aabc04d76fa976abb4a74f4e9676c7556e88df3 (diff) | |
intel: convert to new screen conversion APIs
The compat header takes care of the old server vs new server.
this commit was autogenerated from util/modular/x-driver-screen-scrn-conv.sh
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/i915_render.c')
| -rw-r--r-- | src/i915_render.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/i915_render.c b/src/i915_render.c index c6d5ed73..5605edff 100644 --- a/src/i915_render.c +++ b/src/i915_render.c @@ -172,7 +172,7 @@ static Bool i915_get_dest_format(PicturePtr dest_picture, uint32_t * dst_format) *dst_format = COLR_BUF_ARGB4444; break; default: - scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum]; + scrn = xf86ScreenToScrn(dest_picture->pDrawable->pScreen); intel_debug_fallback(scrn, "Unsupported dest format 0x%x\n", (int)dest_picture->format); @@ -189,7 +189,7 @@ i915_check_composite(int op, PicturePtr dest_picture, int width, int height) { - ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(dest_picture->pDrawable->pScreen); uint32_t tmp1; /* Check for unsupported compositing operations. */ @@ -243,7 +243,7 @@ Bool i915_check_composite_texture(ScreenPtr screen, PicturePtr picture) { if (picture->repeatType > RepeatReflect) { - ScrnInfoPtr scrn = xf86Screens[screen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); intel_debug_fallback(scrn, "Unsupported picture repeat %d\n", picture->repeatType); return FALSE; @@ -251,7 +251,7 @@ i915_check_composite_texture(ScreenPtr screen, PicturePtr picture) if (picture->filter != PictFilterNearest && picture->filter != PictFilterBilinear) { - ScrnInfoPtr scrn = xf86Screens[screen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); intel_debug_fallback(scrn, "Unsupported filter 0x%x\n", picture->filter); return FALSE; @@ -266,7 +266,7 @@ i915_check_composite_texture(ScreenPtr screen, PicturePtr picture) w = picture->pDrawable->width; h = picture->pDrawable->height; if ((w > 2048) || (h > 2048)) { - ScrnInfoPtr scrn = xf86Screens[screen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); intel_debug_fallback(scrn, "Picture w/h too large (%dx%d)\n", w, h); @@ -281,7 +281,7 @@ i915_check_composite_texture(ScreenPtr screen, PicturePtr picture) } if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0])) { - ScrnInfoPtr scrn = xf86Screens[screen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); intel_debug_fallback(scrn, "Unsupported picture format " "0x%x\n", (int)picture->format); @@ -296,7 +296,7 @@ i915_check_composite_texture(ScreenPtr screen, PicturePtr picture) static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit) { - ScrnInfoPtr scrn = xf86Screens[picture->pDrawable->pScreen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(picture->pDrawable->pScreen); intel_screen_private *intel = intel_get_screen_private(scrn); uint32_t format, pitch, filter; uint32_t wrap_mode, tiling_bits; @@ -660,7 +660,7 @@ i915_prepare_composite(int op, PicturePtr source_picture, PicturePtr mask_picture, PicturePtr dest_picture, PixmapPtr source, PixmapPtr mask, PixmapPtr dest) { - ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(dest_picture->pDrawable->pScreen); intel_screen_private *intel = intel_get_screen_private(scrn); drm_intel_bo *bo_table[] = { NULL, /* batch_bo */ @@ -951,7 +951,7 @@ void i915_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY, int dstX, int dstY, int w, int h) { - ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(dest->drawable.pScreen); intel_screen_private *intel = intel_get_screen_private(scrn); /* 28 + 16 + 10 + 20 + 32 + 16 */ |