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

present: Pass capabilities to present_vblank_create by value 

Preparation for moving WNMD code to hw/xwayland. No functional change
intended.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
This commit is contained in:
Michel Dänzer 2021-04-19 18:19:30 +02:00 committed by Michel Dänzer
parent 86e645bcfa
commit 44f705a5b6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
present/present_priv.h
View File

@ -467,7 +467,7 @@ present_vblank_create(WindowPtr window,
SyncFence *wait_fence, SyncFence *wait_fence,
SyncFence *idle_fence, SyncFence *idle_fence,
uint32_t options, uint32_t options,
const uint32_t *capabilities, const uint32_t capabilities,
present_notify_ptr notifies, present_notify_ptr notifies,
int num_notifies, int num_notifies,
uint64_t target_msc, uint64_t target_msc,

2
present/present_scmd.c
View File

@ -736,7 +736,7 @@ present_scmd_pixmap(WindowPtr window,
wait_fence, wait_fence,
idle_fence, idle_fence,
options, options,
screen_priv->info ? &screen_priv->info->capabilities : NULL, screen_priv->info ? screen_priv->info->capabilities : 0,
notifies, notifies,
num_notifies, num_notifies,
target_msc, target_msc,

6
present/present_vblank.c
View File

@ -50,7 +50,7 @@ present_vblank_create(WindowPtr window,
SyncFence *wait_fence, SyncFence *wait_fence,
SyncFence *idle_fence, SyncFence *idle_fence,
uint32_t options, uint32_t options,
const uint32_t *capabilities, const uint32_t capabilities,
present_notify_ptr notifies, present_notify_ptr notifies,
int num_notifies, int num_notifies,
uint64_t target_msc, uint64_t target_msc,
@ -111,13 +111,13 @@ present_vblank_create(WindowPtr window,
if (pixmap != NULL && if (pixmap != NULL &&
!(options & PresentOptionCopy) && !(options & PresentOptionCopy) &&
capabilities) { screen_priv->check_flip) {
if (msc_is_after(target_msc, crtc_msc) && if (msc_is_after(target_msc, crtc_msc) &&
screen_priv->check_flip (target_crtc, window, pixmap, TRUE, valid, x_off, y_off, &reason)) screen_priv->check_flip (target_crtc, window, pixmap, TRUE, valid, x_off, y_off, &reason))
{ {
vblank->flip = TRUE; vblank->flip = TRUE;
vblank->sync_flip = TRUE; vblank->sync_flip = TRUE;
} else if ((*capabilities & PresentCapabilityAsync) && } else if ((capabilities & PresentCapabilityAsync) &&
screen_priv->check_flip (target_crtc, window, pixmap, FALSE, valid, x_off, y_off, &reason)) screen_priv->check_flip (target_crtc, window, pixmap, FALSE, valid, x_off, y_off, &reason))
{ {
vblank->flip = TRUE; vblank->flip = TRUE;

2
present/present_wnmd.c
View File

@ -623,7 +623,7 @@ present_wnmd_pixmap(WindowPtr window,
wait_fence, wait_fence,
idle_fence, idle_fence,
options, options,
&screen_priv->wnmd_info->capabilities, screen_priv->wnmd_info->capabilities,
notifies, notifies,
num_notifies, num_notifies,
target_msc, target_msc,