Module Name: xsrc
Committed By: mrg
Date: Sat Aug 13 23:51:48 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c
xsrc/external/mit/xorg-server/dist/randr: randr.c
Log Message:
fix merge botches.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/randr/randr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
diff -u xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.8 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.9
--- xsrc/external/mit/xorg-server/dist/glx/glxcmds.c:1.8 Thu Aug 11 00:04:27 2016
+++ xsrc/external/mit/xorg-server/dist/glx/glxcmds.c Sat Aug 13 23:51:48 2016
@@ -2349,17 +2349,6 @@ __glXDisp_RenderLarge(__GLXclientState *
*/
}
return Success;
- /*
- ** Reset for the next RenderLarge series.
- */
- __glXResetLargeCommandStatus(cl);
- }
- else {
- /*
- ** This is neither the first nor the last request.
- */
- }
- return Success;
}
}
Index: xsrc/external/mit/xorg-server/dist/randr/randr.c
diff -u xsrc/external/mit/xorg-server/dist/randr/randr.c:1.3 xsrc/external/mit/xorg-server/dist/randr/randr.c:1.4
--- xsrc/external/mit/xorg-server/dist/randr/randr.c:1.3 Thu Aug 11 00:04:35 2016
+++ xsrc/external/mit/xorg-server/dist/randr/randr.c Sat Aug 13 23:51:48 2016
@@ -627,14 +627,6 @@ RRTellChanged(ScreenPtr pScreen)
}
}
-void
-RRSetChanged(ScreenPtr pScreen)
-{
- rrScrPriv(pScreen);
-
- pScrPriv->changed = TRUE;
-}
-
/*
* Return the first output which is connected to an active CRTC
* Used in emulating 1.0 behaviour
