diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-05-08 15:22:44 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-05-14 11:12:36 +0100 |
| commit | 692555cc03c3a3632d2eaacdbbe800afdefd9f77 (patch) | |
| tree | 2c23a589c1059d0804d8b578991e58177fafe436 /src/sna/sna.h | |
| parent | 09e26d38e9eca33e27fd0b30524e75814d5d3ad9 (diff) | |
sna: Rename DRI2 files, functions and variables
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna.h')
| -rw-r--r-- | src/sna/sna.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/sna/sna.h b/src/sna/sna.h index 3a45924f..9c1a34bd 100644 --- a/src/sna/sna.h +++ b/src/sna/sna.h @@ -311,10 +311,13 @@ struct sna { void *scratch; } cursor; - struct sna_dri { + struct sna_dri2 { + bool available; + bool open; + void *flip_pending; unsigned int last_msc[MAX_PIPES]; - } dri; + } dri2; struct sna_xv { XvAdaptorPtr adaptors; @@ -350,9 +353,6 @@ struct sna { struct gen8_render_state gen8; } render_state; - bool dri_available; - bool dri_open; - /* Broken-out options. */ OptionInfoPtr Options; @@ -458,19 +458,20 @@ extern bool sna_wait_for_scanline(struct sna *sna, PixmapPtr pixmap, xf86CrtcPtr crtc, const BoxRec *clip); #if HAVE_DRI2_H -bool sna_dri_open(struct sna *sna, ScreenPtr pScreen); -void sna_dri_page_flip_handler(struct sna *sna, struct drm_event_vblank *event); -void sna_dri_vblank_handler(struct sna *sna, struct drm_event_vblank *event); -void sna_dri_destroy_window(WindowPtr win); -void sna_dri_close(struct sna *sna, ScreenPtr pScreen); +bool sna_dri2_open(struct sna *sna, ScreenPtr pScreen); +void sna_dri2_page_flip_handler(struct sna *sna, struct drm_event_vblank *event); +void sna_dri2_vblank_handler(struct sna *sna, struct drm_event_vblank *event); +void sna_dri2_pixmap_update_bo(struct sna *sna, PixmapPtr pixmap); +void sna_dri2_destroy_window(WindowPtr win); +void sna_dri2_close(struct sna *sna, ScreenPtr pScreen); #else -static inline bool sna_dri_open(struct sna *sna, ScreenPtr pScreen) { return false; } -static inline void sna_dri_page_flip_handler(struct sna *sna, struct drm_event_vblank *event) { } -static inline void sna_dri_vblank_handler(struct sna *sna, struct drm_event_vblank *event) { } -static inline void sna_dri_destroy_window(WindowPtr win) { } -static inline void sna_dri_close(struct sna *sna, ScreenPtr pScreen) { } +static inline bool sna_dri2_open(struct sna *sna, ScreenPtr pScreen) { return false; } +static inline void sna_dri2_page_flip_handler(struct sna *sna, struct drm_event_vblank *event) { } +static inline void sna_dri2_vblank_handler(struct sna *sna, struct drm_event_vblank *event) { } +static inline void sna_dri2_pixmap_update_bo(struct sna *sna, PixmapPtr pixmap) { } +static inline void sna_dri2_destroy_window(WindowPtr win) { } +static inline void sna_dri2_close(struct sna *sna, ScreenPtr pScreen) { } #endif -void sna_dri_pixmap_update_bo(struct sna *sna, PixmapPtr pixmap); extern bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc, uint32_t rotation); extern int sna_crtc_to_pipe(xf86CrtcPtr crtc); |