Module Name: xsrc
Committed By: martin
Date: Sun Dec 4 10:58:12 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-glint/dist/src: pm2_accel.c
Log Message:
Remove duplicate function
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-glint/dist/src/pm2_accel.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/xf86-video-glint/dist/src/pm2_accel.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm2_accel.c:1.3 xsrc/external/mit/xf86-video-glint/dist/src/pm2_accel.c:1.4
--- xsrc/external/mit/xf86-video-glint/dist/src/pm2_accel.c:1.3 Fri Dec 2 22:58:26 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm2_accel.c Sun Dec 4 10:58:12 2016
@@ -141,107 +141,6 @@ static void Permedia2PolySegmentThinSoli
# define STIPPLE_SWAP 0
#endif
-void
-Permedia2InitializeEngine(ScrnInfoPtr pScrn)
-{
- GLINTPtr pGlint = GLINTPTR(pScrn);
-
- /* Initialize the Accelerator Engine to defaults */
-
- TRACE_ENTER("Permedia2InitializeEngine");
-
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, ScissorMode);
- GLINT_SLOW_WRITE_REG(UNIT_ENABLE, FBWriteMode);
- GLINT_SLOW_WRITE_REG(0, dXSub);
- GLINT_SLOW_WRITE_REG(GWIN_DisableLBUpdate, GLINTWindow);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, DitherMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, AlphaBlendMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, TextureColorMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, TextureAddressMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, PMTextureReadMode);
- GLINT_SLOW_WRITE_REG(pGlint->pprod, LBReadMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, AlphaBlendMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, TexelLUTMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, YUVMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, DepthMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, RouterMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, FogMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, AntialiasMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, AlphaTestMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, StencilMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, AreaStippleMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, LogicalOpMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, DepthMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, StatisticMode);
- GLINT_SLOW_WRITE_REG(0x400, FilterMode);
- GLINT_SLOW_WRITE_REG(0xffffffff, FBHardwareWriteMask);
- GLINT_SLOW_WRITE_REG(0xffffffff, FBSoftwareWriteMask);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, RasterizerMode);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, GLINTDepth);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, FBSourceOffset);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, FBPixelOffset);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, LBSourceOffset);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, WindowOrigin);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, FBWindowBase);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, FBSourceBase);
- GLINT_SLOW_WRITE_REG(UNIT_DISABLE, LBWindowBase);
-
-#if X_BYTE_ORDER == X_BIG_ENDIAN
- pGlint->RasterizerSwap = 1;
-#else
- pGlint->RasterizerSwap = 0;
-#endif
-
- switch (pScrn->bitsPerPixel) {
- case 8:
- pGlint->PixelWidth = 0x0; /* 8 Bits */
- pGlint->TexMapFormat = pGlint->pprod;
-#if X_BYTE_ORDER == X_BIG_ENDIAN
- pGlint->RasterizerSwap |= 3<<15; /* Swap host data */
-#endif
- break;
- case 16:
- pGlint->PixelWidth = 0x1; /* 16 Bits */
- pGlint->TexMapFormat = pGlint->pprod | 1<<19;
-#if X_BYTE_ORDER == X_BIG_ENDIAN
- pGlint->RasterizerSwap |= 2<<15; /* Swap host data */
-#endif
- break;
- case 24:
- pGlint->PixelWidth = 0x4; /* 24 Bits */
- pGlint->TexMapFormat = pGlint->pprod | 2<<19;
- break;
- case 32:
- pGlint->PixelWidth = 0x2; /* 32 Bits */
- pGlint->TexMapFormat = pGlint->pprod | 2<<19;
- break;
- }
- pGlint->ClippingOn = FALSE;
- pGlint->startxdom = 0;
- pGlint->startxsub = 0;
- pGlint->starty = 0;
- pGlint->count = 0;
- pGlint->dy = 1<<16;
- pGlint->dxdom = 0;
- pGlint->x = 0;
- pGlint->y = 0;
- pGlint->h = 0;
- pGlint->w = 0;
- pGlint->ROP = 0xFF;
- GLINT_SLOW_WRITE_REG(pGlint->PixelWidth, FBReadPixel);
- GLINT_SLOW_WRITE_REG(pGlint->TexMapFormat, PMTextureMapFormat);
- GLINT_SLOW_WRITE_REG(0, RectangleSize);
- GLINT_SLOW_WRITE_REG(0, RectangleOrigin);
- GLINT_SLOW_WRITE_REG(0, dXDom);
- GLINT_SLOW_WRITE_REG(1<<16, dY);
- GLINT_SLOW_WRITE_REG(0, StartXDom);
- GLINT_SLOW_WRITE_REG(0, StartXSub);
- GLINT_SLOW_WRITE_REG(0, StartY);
- GLINT_SLOW_WRITE_REG(0, GLINTCount);
-
- TRACE_EXIT("Permedia2InitializeEngine");
-}
#endif
Bool
