Module Name: xsrc
Committed By: macallan
Date: Wed Dec 14 16:51:44 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-glint/dist/src: pm2_exa.c pm3_exa.c
Log Message:
appease clang
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.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_exa.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.4 xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.5
--- xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.4 Wed Dec 14 16:46:31 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c Wed Dec 14 16:51:44 2016
@@ -208,10 +208,10 @@ Pm2UploadToScreen(PixmapPtr pDst, int x,
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
- int offset = exaGetPixmapOffset(pDst);
- char *dst = pGlint->FbBase + offset;
- uint32_t *s;
- int dst_pitch = exaGetPixmapPitch(pDst);
+ int offset = exaGetPixmapOffset(pDst);
+ unsigned char *dst = pGlint->FbBase + offset;
+ CARD32 *s;
+ int dst_pitch = exaGetPixmapPitch(pDst);
int bpp = pDst->drawable.bitsPerPixel;
int cpp = (bpp + 7) >> 3;
@@ -233,19 +233,10 @@ Pm2UploadToScreen(PixmapPtr pDst, int x,
}
} else {
/* use host blit */
- GLINT_WAIT(3);
y += offset / dst_pitch;
-#if 0
- GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
- GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
- Permedia2LoadCoord(pScrn, x, y, w, h);
- GLINT_WRITE_REG(PrimitiveRectangle |
- XPositive | YPositive | SyncOnHostData,
- Render);
-#endif
adr = y * (dst_pitch >> 2) + x;
while (h--) {
- s = (uint32_t *)src;
+ s = (CARD32 *)src;
xx = w;
GLINT_WAIT(1);
GLINT_WRITE_REG(adr, TextureDownloadOffset);
@@ -276,9 +267,9 @@ Pm2DownloadFromScreen(PixmapPtr pSrc, in
char *dst, int dst_pitch)
{
ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
- GLINTPtr pGlint = GLINTPTR(pScrn);
- char *src = pGlint->FbBase + exaGetPixmapOffset(pSrc);
- int src_pitch = exaGetPixmapPitch(pSrc);
+ GLINTPtr pGlint = GLINTPTR(pScrn);
+ unsigned char *src = pGlint->FbBase + exaGetPixmapOffset(pSrc);
+ int src_pitch = exaGetPixmapPitch(pSrc);
ENTER;
int bpp = pSrc->drawable.bitsPerPixel;
Index: xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.3 xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.4
--- xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.3 Sat Dec 10 07:23:38 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c Wed Dec 14 16:51:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pm3_exa.c,v 1.3 2016/12/10 07:23:38 macallan Exp $ */
+/* $NetBSD: pm3_exa.c,v 1.4 2016/12/14 16:51:44 macallan Exp $ */
/*
* Copyright (c) 2016 Michael Lorenz
@@ -251,9 +251,9 @@ Pm3UploadToScreen(PixmapPtr pDst, int x,
char *src, int src_pitch)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- GLINTPtr pGlint = GLINTPTR(pScrn);
- char *dst = pGlint->FbBase + exaGetPixmapOffset(pDst);
- int dst_pitch = exaGetPixmapPitch(pDst);
+ GLINTPtr pGlint = GLINTPTR(pScrn);
+ unsigned char *dst = pGlint->FbBase + exaGetPixmapOffset(pDst);
+ int dst_pitch = exaGetPixmapPitch(pDst);
int bpp = pDst->drawable.bitsPerPixel;
int cpp = (bpp + 7) >> 3;
@@ -280,9 +280,9 @@ Pm3DownloadFromScreen(PixmapPtr pSrc, in
char *dst, int dst_pitch)
{
ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
- GLINTPtr pGlint = GLINTPTR(pScrn);
- char *src = pGlint->FbBase + exaGetPixmapOffset(pSrc);
- int src_pitch = exaGetPixmapPitch(pSrc);
+ GLINTPtr pGlint = GLINTPTR(pScrn);
+ unsigned char *src = pGlint->FbBase + exaGetPixmapOffset(pSrc);
+ int src_pitch = exaGetPixmapPitch(pSrc);
ENTER;
int bpp = pSrc->drawable.bitsPerPixel;
