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

xwayland/present: Simplify query_capabilities 

No need for the WNMD indirection anymore.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Michel Dänzer 2021-04-19 18:26:55 +02:00 committed by Michel Dänzer
parent 244403ec87
commit 7b78cf6b3a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/xwayland/xwayland-present.c
View File

@ -34,6 +34,10 @@
#include "xwayland-pixmap.h" #include "xwayland-pixmap.h"
#include "glamor.h" #include "glamor.h"
#define XWL_PRESENT_CAPS PresentCapabilityAsync
/* /*
* When not flipping let Present copy with 60fps. * When not flipping let Present copy with 60fps.
* When flipping wait on frame_callback, otherwise * When flipping wait on frame_callback, otherwise
@ -138,9 +142,9 @@ present_wnmd_queue_vblank(ScreenPtr screen,
} }
static uint32_t static uint32_t
present_wnmd_query_capabilities(present_screen_priv_ptr screen_priv) xwl_present_query_capabilities(present_screen_priv_ptr screen_priv)
{ {
return screen_priv->wnmd_info->capabilities; return XWL_PRESENT_CAPS;
} }
static RRCrtcPtr static RRCrtcPtr
@ -607,7 +611,7 @@ present_wnmd_pixmap(WindowPtr window,
wait_fence, wait_fence,
idle_fence, idle_fence,
options, options,
screen_priv->wnmd_info->capabilities, XWL_PRESENT_CAPS,
notifies, notifies,
num_notifies, num_notifies,
target_msc, target_msc,
@ -1178,7 +1182,6 @@ static present_wnmd_info_rec xwl_present_info = {
.get_ust_msc = xwl_present_get_ust_msc, .get_ust_msc = xwl_present_get_ust_msc,
.queue_vblank = xwl_present_queue_vblank, .queue_vblank = xwl_present_queue_vblank,
.capabilities = PresentCapabilityAsync,
.check_flip2 = xwl_present_check_flip2, .check_flip2 = xwl_present_check_flip2,
.flips_stop = xwl_present_flips_stop .flips_stop = xwl_present_flips_stop
}; };
@ -1207,7 +1210,7 @@ xwl_present_init(ScreenPtr screen)
screen_priv->wnmd_info = &xwl_present_info; screen_priv->wnmd_info = &xwl_present_info;
screen_priv->query_capabilities = present_wnmd_query_capabilities; screen_priv->query_capabilities = xwl_present_query_capabilities;
screen_priv->get_crtc = present_wnmd_get_crtc; screen_priv->get_crtc = present_wnmd_get_crtc;
screen_priv->check_flip = present_wnmd_check_flip; screen_priv->check_flip = present_wnmd_check_flip;