[PATCH 19/19] xf86/common: remove some more pScrn->pScreen uses
Dave Airlie
airlied at gmail.com
Mon May 14 09:41:12 PDT 2012
remove some more conversions that appeared after api cleanups.
Signed-off-by: Dave Airlie <airlied at redhat.com>
---
hw/xfree86/common/xf86cmap.c | 2 +-
hw/xfree86/common/xf86xv.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 5283c5f..04eb995 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -910,7 +910,7 @@ int
CMapChangeGamma(ScrnInfoPtr pScrn, Gamma gamma)
{
int ret = Success;
- ScreenPtr pScreen = pScrn->pScreen;
+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
CMapColormapPtr pColPriv;
CMapScreenPtr pScreenPriv;
CMapLinkPtr pLink;
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index df34944..516e181 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -1067,7 +1067,7 @@ xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv, WindowPtr pWin, Bool visible)
static void
xf86XVReputOrStopAllPorts(ScrnInfoPtr pScrn, Bool onlyChanged)
{
- ScreenPtr pScreen = pScrn->pScreen;
+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
XvAdaptorPtr pa;
int c, i;
@@ -1360,7 +1360,7 @@ xf86XVLeaveVT(ScrnInfoPtr pScrn, int flags)
static void
xf86XVAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int flags)
{
- ScreenPtr pScreen = pScrn->pScreen;
+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);
if (ScreenPriv->AdjustFrame) {
@@ -1375,7 +1375,7 @@ xf86XVAdjustFrame(ScrnInfoPtr pScrn, int x, int y, int flags)
static void
xf86XVModeSet(ScrnInfoPtr pScrn)
{
- ScreenPtr pScreen = pScrn->pScreen;
+ ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
XF86XVScreenPtr ScreenPriv;
/* Can be called before pScrn->pScreen is set */
--
1.7.6
More information about the xorg-devel
mailing list