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

xf86/modes: drop two uses of screenInfo 

Just use new macros to access scrn->screen.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-04-11 09:46:39 +01:00 committed by Dave Airlie
parent cc4fe613d0
commit 738367ac9b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/modes/xf86RandR12.c
View File

@ -960,7 +960,7 @@ xf86RandR12SetTransformSupport(ScreenPtr pScreen, Bool transforms)
void void
xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y) xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y)
{ {
ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
if (xf86RandR12Generation != serverGeneration || if (xf86RandR12Generation != serverGeneration ||
XF86RANDRINFO(pScreen)->virtualX == -1) { XF86RANDRINFO(pScreen)->virtualX == -1) {

4
hw/xfree86/modes/xf86Rotate.c
View File

@ -370,9 +370,7 @@ xf86CrtcRotate(xf86CrtcPtr crtc)
{ {
ScrnInfoPtr pScrn = crtc->scrn; ScrnInfoPtr pScrn = crtc->scrn;
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
/* if this is called during ScreenInit() we don't have pScrn->pScreen yet */
ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
PictTransform crtc_to_fb; PictTransform crtc_to_fb;
struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc; struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;
xFixed *new_params = NULL; xFixed *new_params = NULL;