diff options
author | Chris Michael <cp.michael@samsung.com> | 2017-03-27 10:56:50 -0400 |
---|---|---|
committer | Chris Michael <cp.michael@samsung.com> | 2017-04-18 07:55:10 -0400 |
commit | 205c829a1180939dad516a56d3bf94127f0a97d0 (patch) | |
tree | 4ef488939ae916c950067f4d2ce97a4c0bc2b340 /src | |
parent | 980ed70eb9af0e829a58e605351121685ac3e66a (diff) |
ecore-drm2: Store cursor size on device
As we will need these values later to determine if an FBO can go onto
the cursor plane, we should store this in the device structure to
avoid having to refetch them later.
@fix
Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/ecore_drm2/ecore_drm2_device.c | 12 | ||||
-rw-r--r-- | src/lib/ecore_drm2/ecore_drm2_private.h | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/lib/ecore_drm2/ecore_drm2_device.c b/src/lib/ecore_drm2/ecore_drm2_device.c index 6d7c1ff78f..250a5960b5 100644 --- a/src/lib/ecore_drm2/ecore_drm2_device.c +++ b/src/lib/ecore_drm2/ecore_drm2_device.c | |||
@@ -722,13 +722,21 @@ ecore_drm2_device_cursor_size_get(Ecore_Drm2_Device *device, int *width, int *he | |||
722 | { | 722 | { |
723 | *width = 64; | 723 | *width = 64; |
724 | ret = sym_drmGetCap(device->fd, DRM_CAP_CURSOR_WIDTH, &caps); | 724 | ret = sym_drmGetCap(device->fd, DRM_CAP_CURSOR_WIDTH, &caps); |
725 | if (ret == 0) *width = caps; | 725 | if (ret == 0) |
726 | { | ||
727 | device->cursor.width = caps; | ||
728 | *width = caps; | ||
729 | } | ||
726 | } | 730 | } |
727 | if (height) | 731 | if (height) |
728 | { | 732 | { |
729 | *height = 64; | 733 | *height = 64; |
730 | ret = sym_drmGetCap(device->fd, DRM_CAP_CURSOR_HEIGHT, &caps); | 734 | ret = sym_drmGetCap(device->fd, DRM_CAP_CURSOR_HEIGHT, &caps); |
731 | if (ret == 0) *height = caps; | 735 | if (ret == 0) |
736 | { | ||
737 | device->cursor.height = caps; | ||
738 | *height = caps; | ||
739 | } | ||
732 | } | 740 | } |
733 | } | 741 | } |
734 | 742 | ||
diff --git a/src/lib/ecore_drm2/ecore_drm2_private.h b/src/lib/ecore_drm2/ecore_drm2_private.h index 60efbf7394..80804ec1b1 100644 --- a/src/lib/ecore_drm2/ecore_drm2_private.h +++ b/src/lib/ecore_drm2/ecore_drm2_private.h | |||
@@ -795,6 +795,11 @@ struct _Ecore_Drm2_Device | |||
795 | uint32_t width, height; | 795 | uint32_t width, height; |
796 | } min, max; | 796 | } min, max; |
797 | 797 | ||
798 | struct | ||
799 | { | ||
800 | int width, height; | ||
801 | } cursor; | ||
802 | |||
798 | Eeze_Udev_Watch *watch; | 803 | Eeze_Udev_Watch *watch; |
799 | Ecore_Event_Handler *active_hdlr; | 804 | Ecore_Event_Handler *active_hdlr; |
800 | Ecore_Event_Handler *device_change_hdlr; | 805 | Ecore_Event_Handler *device_change_hdlr; |