diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-27 14:36:04 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-28 10:43:35 -0700 |
| commit | 957bf959fb577b292a3e4f6bb67740ca09e7aeb9 (patch) | |
| tree | 54093fb0af60b8ff0b22d647fe3c7b9a5f3d4cfb /mi | |
| parent | a7b97b0fa85d695ae19d194cfa3267159d149e5d (diff) | |
dix/render: consolidate window format matching code.
This code existed in 3 different forms, perhaps it should be
consolidated.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/midispcur.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/mi/midispcur.c b/mi/midispcur.c index 9ee824283..df141cdc7 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -151,19 +151,6 @@ miDCRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) #ifdef ARGB_CURSOR #define EnsurePicture(picture,draw,win) (picture || miDCMakePicture(&picture,draw,win)) -static VisualPtr -miDCGetWindowVisual(WindowPtr pWin) -{ - ScreenPtr pScreen = pWin->drawable.pScreen; - VisualID vid = wVisual(pWin); - int i; - - for (i = 0; i < pScreen->numVisuals; i++) - if (pScreen->visuals[i].vid == vid) - return &pScreen->visuals[i]; - return 0; -} - static PicturePtr miDCMakePicture(PicturePtr * ppPicture, DrawablePtr pDraw, WindowPtr pWin) { @@ -174,10 +161,7 @@ miDCMakePicture(PicturePtr * ppPicture, DrawablePtr pDraw, WindowPtr pWin) PicturePtr pPicture; int error; - pVisual = miDCGetWindowVisual(pWin); - if (!pVisual) - return 0; - pFormat = PictureMatchVisual(pScreen, pDraw->depth, pVisual); + pFormat = PictureWindowFormat(pWin); if (!pFormat) return 0; pPicture = CreatePicture(0, pDraw, pFormat, |