diff options
| author | Jakob Bornecrantz <[email protected]> | 2009-08-27 17:56:30 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2009-08-28 12:46:24 +0200 |
| commit | 7d9af52bc59bfeb19d9bdb55258f4a830a1b0d04 (patch) | |
| tree | 13b4a818c64cc92ff0025743a4bf508120fd4401 | |
| parent | b26aee0ffed3f3baee9d65365812e40598a26138 (diff) | |
st/xorg: Fix some warnings
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_crtc.c | 3 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_driver.c | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_tracker.h | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c index 2235961b031..2110c878dca 100644 --- a/src/gallium/state_trackers/xorg/xorg_crtc.c +++ b/src/gallium/state_trackers/xorg/xorg_crtc.c @@ -260,9 +260,8 @@ static const xf86CrtcFuncsRec crtc_funcs = { }; void -cursor_destroy(xf86CrtcPtr crtc) +crtc_cursor_destroy(xf86CrtcPtr crtc) { - modesettingPtr ms = modesettingPTR(crtc->scrn); struct crtc_private *crtcp = crtc->driver_private; if (crtcp->cursor_buf) { diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c index d2253459696..bc3fd54bdb4 100644 --- a/src/gallium/state_trackers/xorg/xorg_driver.c +++ b/src/gallium/state_trackers/xorg/xorg_driver.c @@ -661,10 +661,6 @@ FreeScreen(int scrnIndex, int flags) FreeRec(xf86Screens[scrnIndex]); } -/* HACK */ -void -cursor_destroy(xf86CrtcPtr crtc); - static void LeaveVT(int scrnIndex, int flags) { @@ -676,7 +672,7 @@ LeaveVT(int scrnIndex, int flags) for (o = 0; o < config->num_crtc; o++) { xf86CrtcPtr crtc = config->crtc[o]; - cursor_destroy(crtc); + crtc_cursor_destroy(crtc); if (crtc->rotatedPixmap || crtc->rotatedData) { crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap, diff --git a/src/gallium/state_trackers/xorg/xorg_tracker.h b/src/gallium/state_trackers/xorg/xorg_tracker.h index 8c60d50927d..b1ab783a15a 100644 --- a/src/gallium/state_trackers/xorg/xorg_tracker.h +++ b/src/gallium/state_trackers/xorg/xorg_tracker.h @@ -39,6 +39,7 @@ #include <xf86drmMode.h> #include <xorg-server.h> #include <xf86.h> +#include "xf86Crtc.h" #include <exa.h> #ifdef DRM_MODE_FEATURE_DIRTYFB @@ -140,6 +141,9 @@ driCloseScreen(ScreenPtr pScreen); void crtc_init(ScrnInfoPtr pScrn); +void +crtc_cursor_destroy(xf86CrtcPtr crtc); + /*********************************************************************** * xorg_output.c |