frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86/modes: Refactor xf86_use_hw_cursor_argb to use xf86_use_hw_cursor (v2) 

This reduces code duplication.

v2: No functional change this time.

Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Michel Dänzer 2015-12-24 16:20:49 +09:00 committed by Michel Dänzer
parent a3e681eafa
commit c3e4e9fc5d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/modes/xf86Cursors.c
View File

@ -535,19 +535,13 @@ xf86_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
cursor = RefCursor(cursor); if (!xf86_use_hw_cursor(screen, cursor))
if (xf86_config->cursor) return FALSE;
FreeCursor(xf86_config->cursor, None);
xf86_config->cursor = cursor;
/* Make sure ARGB support is available */ /* Make sure ARGB support is available */
if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0) if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)
return FALSE; return FALSE;
if (cursor->bits->width > cursor_info->MaxWidth ||
cursor->bits->height > cursor_info->MaxHeight)
return FALSE;
return TRUE; return TRUE;
} }