summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
diff options
context:
space:
mode:
authorgareth <gareth>2001-03-07 07:38:55 +0000
committergareth <gareth>2001-03-07 07:38:55 +0000
commitcca9682ba77609b7420705433fb0ea0183adec5f (patch)
treecce1d82104c5b6f65acc3cdf69872dbf4c481b93 /xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
parent687a45a5f6fca3a67b9f5d03cb81a356a20be2ae (diff)
Get rid of FullScreen mode messages.
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c')
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
index f5e7306a2..0ce50455a 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
@@ -16,20 +16,20 @@
static char TDFXKernelDriverName[] = "tdfx";
static char TDFXClientDriverName[] = "tdfx";
-static Bool TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
+static Bool TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
drmContext hwContext, void *pVisualConfigPriv,
DRIContextType contextStore);
static void TDFXDestroyContext(ScreenPtr pScreen, drmContext hwContext,
DRIContextType contextStore);
-static void TDFXDRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
- DRIContextType readContextType,
+static void TDFXDRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
+ DRIContextType readContextType,
void *readContextStore,
- DRIContextType writeContextType,
+ DRIContextType writeContextType,
void *writeContextStore);
static Bool TDFXDRIOpenFullScreen(ScreenPtr pScreen);
static Bool TDFXDRICloseFullScreen(ScreenPtr pScreen);
static void TDFXDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index);
-static void TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
+static void TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
RegionPtr prgnSrc, CARD32 index);
static void TDFXDRITransitionTo2d(ScreenPtr pScreen);
static void TDFXDRITransitionTo3d(ScreenPtr pScreen);
@@ -65,7 +65,7 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
xfree(pTDFXConfigs);
return FALSE;
}
- for (i=0; i<numConfigs; i++)
+ for (i=0; i<numConfigs; i++)
pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
i=0;
@@ -104,7 +104,7 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
if (depth) {
if (pTDFX->cpp>2)
pConfigs[i].depthSize = 24;
- else
+ else
pConfigs[i].depthSize = 16;
} else {
pConfigs[i].depthSize = 0;
@@ -158,7 +158,7 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
return FALSE;
}
- for (i = 0; i < numConfigs; i++)
+ for (i = 0; i < numConfigs; i++)
pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
i=0;
@@ -199,7 +199,7 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
if (depth) {
if (pTDFX->cpp > 2)
pConfigs[i].depthSize = 24;
- else
+ else
pConfigs[i].depthSize = 16;
} else {
pConfigs[i].depthSize = 0;
@@ -249,7 +249,7 @@ TDFXDoWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
TDFXNeedSync(pScrn);
}
-static void
+static void
TDFXDoBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
pointer pReadmask)
{
@@ -343,10 +343,10 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
pDRIInfo->maxDrawableTableEntry = TDFX_MAX_DRAWABLES;
#ifdef NOT_DONE
- /* FIXME need to extend DRI protocol to pass this size back to client
+ /* FIXME need to extend DRI protocol to pass this size back to client
* for SAREA mapping that includes a device private record
*/
- pDRIInfo->SAREASize =
+ pDRIInfo->SAREASize =
((sizeof(XF86DRISAREARec) + 0xfff) & 0x1000); /* round to page */
/* + shared memory device private rec */
#else
@@ -413,7 +413,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
}
pTDFXDRI->regsSize=TDFXIOMAPSIZE;
- if (drmAddMap(pTDFX->drmSubFD, (drmHandle)pTDFX->MMIOAddr[0],
+ if (drmAddMap(pTDFX->drmSubFD, (drmHandle)pTDFX->MMIOAddr[0],
pTDFXDRI->regsSize, DRM_REGISTERS, 0, &pTDFXDRI->regs)<0) {
TDFXDRICloseScreen(pScreen);
xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap failed, disabling DRI.\n");
@@ -453,7 +453,7 @@ TDFXDRICloseScreen(ScreenPtr pScreen)
}
static Bool
-TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
+TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
drmContext hwContext, void *pVisualConfigPriv,
DRIContextType contextStore)
{
@@ -461,7 +461,7 @@ TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
}
static void
-TDFXDestroyContext(ScreenPtr pScreen, drmContext hwContext,
+TDFXDestroyContext(ScreenPtr pScreen, drmContext hwContext,
DRIContextType contextStore)
{
}
@@ -493,7 +493,7 @@ TDFXDRIFinishScreenInit(ScreenPtr pScreen)
}
static void
-TDFXDRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
+TDFXDRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
DRIContextType oldContextType, void *oldContext,
DRIContextType newContextType, void *newContext)
{
@@ -515,10 +515,10 @@ TDFXDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index)
TDFXSetupForSolidFill(pScrn, 0, GXcopy, -1);
while (nbox--) {
TDFXSelectBuffer(pTDFX, TDFX_BACK);
- TDFXSubsequentSolidFillRect(pScrn, pbox->x1, pbox->y1,
+ TDFXSubsequentSolidFillRect(pScrn, pbox->x1, pbox->y1,
pbox->x2-pbox->x1, pbox->y2-pbox->y1);
TDFXSelectBuffer(pTDFX, TDFX_DEPTH);
- TDFXSubsequentSolidFillRect(pScrn, pbox->x1, pbox->y1,
+ TDFXSubsequentSolidFillRect(pScrn, pbox->x1, pbox->y1,
pbox->x2-pbox->x1, pbox->y2-pbox->y1);
pbox++;
}
@@ -534,7 +534,7 @@ TDFXDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index)
are reversed.
*/
static void
-TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
+TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
RegionPtr prgnSrc, CARD32 index)
{
ScreenPtr pScreen = pParent->drawable.pScreen;
@@ -681,11 +681,11 @@ TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
static Bool
TDFXDRIOpenFullScreen(ScreenPtr pScreen)
{
+#if 0
ScrnInfoPtr pScrn;
TDFXPtr pTDFX;
xf86DrvMsg(pScreen->myNum, X_INFO, "OpenFullScreen\n");
-#if 0
pScrn = xf86Screens[pScreen->myNum];
pTDFX=TDFXPTR(pScrn);
if (pTDFX->numChips>1) {
@@ -698,10 +698,10 @@ TDFXDRIOpenFullScreen(ScreenPtr pScreen)
static Bool
TDFXDRICloseFullScreen(ScreenPtr pScreen)
{
+#if 0
ScrnInfoPtr pScrn;
xf86DrvMsg(pScreen->myNum, X_INFO, "CloseFullScreen\n");
-#if 0
pScrn = xf86Screens[pScreen->myNum];
TDFXDisableSLI(pScrn);
#endif
@@ -715,7 +715,7 @@ TDFXDRITransitionTo2d(ScreenPtr pScreen)
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
TDFXPtr pTDFX = TDFXPTR(pScrn);
- xf86FreeOffscreenArea(pTDFX->reservedArea);
+ xf86FreeOffscreenArea(pTDFX->reservedArea);
}
@@ -737,7 +737,7 @@ TDFXDRITransitionTo3d(ScreenPtr pScreen)
}
xf86PurgeUnlockedOffscreenAreas(pScreen);
-
+
/* this is an ugly hack! isnt there a resize? */
pArea = xf86AllocateOffscreenArea(pScreen, pScrn->displayWidth,
pTDFX->pixmapCacheLinesMin,