andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

present: Fold wnmd_init_mode_hooks into wnmd_screen_init 

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-16 18:45:39 +02:00 committed by Michel Dänzer
parent 10bdd87fe4
commit c35a716b02
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
present/present_priv.h
View File

@ -481,10 +481,4 @@ present_vblank_scrap(present_vblank_ptr vblank);
void
present_vblank_destroy(present_vblank_ptr vblank);
/*
* present_wnmd.c
*/
void
present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv);
#endif /* _PRESENT_PRIV_H_ */

40
present/present_wnmd.c
View File

@ -708,9 +708,26 @@ present_wnmd_flush(WindowPtr window)
(*screen_priv->wnmd_info->flush) (window);
}
void
present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv)
/*
* Initialize a screen for use with present in window flip mode (wnmd)
*/
int
present_wnmd_screen_init(ScreenPtr screen, present_wnmd_info_ptr info)
{
present_screen_priv_ptr screen_priv;
if (!present_screen_register_priv_keys())
return FALSE;
if (present_screen_priv(screen))
return TRUE;
screen_priv = present_screen_priv_init(screen);
if (!screen_priv)
return FALSE;
screen_priv->wnmd_info = info;
screen_priv->query_capabilities = &present_wnmd_query_capabilities;
screen_priv->get_crtc = &present_wnmd_get_crtc;
@ -724,25 +741,6 @@ present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv)
screen_priv->re_execute = &present_wnmd_re_execute;
screen_priv->abort_vblank = &present_wnmd_abort_vblank;
}
/*
* Initialize a screen for use with present in window flip mode (wnmd)
*/
int
present_wnmd_screen_init(ScreenPtr screen, present_wnmd_info_ptr info)
{
if (!present_screen_register_priv_keys())
return FALSE;
if (!present_screen_priv(screen)) {
present_screen_priv_ptr screen_priv = present_screen_priv_init(screen);
if (!screen_priv)
return FALSE;
screen_priv->wnmd_info = info;
present_wnmd_init_mode_hooks(screen_priv);
}
return TRUE;
}