aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/miext
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/miext')
-rw-r--r--xorg-server/miext/shadow/Makefile.am4
-rw-r--r--xorg-server/miext/shadow/c2p_core.h187
-rw-r--r--xorg-server/miext/shadow/shadow.h12
-rw-r--r--xorg-server/miext/shadow/shafb4.c139
-rw-r--r--xorg-server/miext/shadow/shafb8.c143
-rw-r--r--xorg-server/miext/shadow/shiplan2p4.c136
-rw-r--r--xorg-server/miext/shadow/shiplan2p8.c137
-rw-r--r--xorg-server/miext/shadow/shpacked.c1
8 files changed, 758 insertions, 1 deletions
diff --git a/xorg-server/miext/shadow/Makefile.am b/xorg-server/miext/shadow/Makefile.am
index 30f7bda96..1db8a26b4 100644
--- a/xorg-server/miext/shadow/Makefile.am
+++ b/xorg-server/miext/shadow/Makefile.am
@@ -9,7 +9,11 @@ endif
libshadow_la_SOURCES = \
shadow.c \
shadow.h \
+ shafb4.c \
+ shafb8.c \
shalloc.c \
+ shiplan2p4.c \
+ shiplan2p8.c \
shpacked.c \
shplanar8.c \
shplanar.c \
diff --git a/xorg-server/miext/shadow/c2p_core.h b/xorg-server/miext/shadow/c2p_core.h
new file mode 100644
index 000000000..5b9ea066c
--- /dev/null
+++ b/xorg-server/miext/shadow/c2p_core.h
@@ -0,0 +1,187 @@
+/*
+ * Fast C2P (Chunky-to-Planar) Conversion
+ *
+ * NOTES:
+ * - This code was inspired by Scout's C2P tutorial
+ * - It assumes to run on a big endian system
+ *
+ * Copyright © 2003-2008 Geert Uytterhoeven
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+
+ /*
+ * Basic transpose step
+ */
+
+static inline void _transp(CARD32 d[], unsigned int i1, unsigned int i2,
+ unsigned int shift, CARD32 mask)
+{
+ CARD32 t = (d[i1] ^ (d[i2] >> shift)) & mask;
+
+ d[i1] ^= t;
+ d[i2] ^= t << shift;
+}
+
+
+static inline void c2p_unsupported(void) {
+ BUG_WARN(1);
+}
+
+static inline CARD32 get_mask(unsigned int n)
+{
+ switch (n) {
+ case 1:
+ return 0x55555555;
+
+ case 2:
+ return 0x33333333;
+
+ case 4:
+ return 0x0f0f0f0f;
+
+ case 8:
+ return 0x00ff00ff;
+
+ case 16:
+ return 0x0000ffff;
+ }
+
+ c2p_unsupported();
+ return 0;
+}
+
+
+ /*
+ * Transpose operations on 8 32-bit words
+ */
+
+static inline void transp8(CARD32 d[], unsigned int n, unsigned int m)
+{
+ CARD32 mask = get_mask(n);
+
+ switch (m) {
+ case 1:
+ /* First n x 1 block */
+ _transp(d, 0, 1, n, mask);
+ /* Second n x 1 block */
+ _transp(d, 2, 3, n, mask);
+ /* Third n x 1 block */
+ _transp(d, 4, 5, n, mask);
+ /* Fourth n x 1 block */
+ _transp(d, 6, 7, n, mask);
+ return;
+
+ case 2:
+ /* First n x 2 block */
+ _transp(d, 0, 2, n, mask);
+ _transp(d, 1, 3, n, mask);
+ /* Second n x 2 block */
+ _transp(d, 4, 6, n, mask);
+ _transp(d, 5, 7, n, mask);
+ return;
+
+ case 4:
+ /* Single n x 4 block */
+ _transp(d, 0, 4, n, mask);
+ _transp(d, 1, 5, n, mask);
+ _transp(d, 2, 6, n, mask);
+ _transp(d, 3, 7, n, mask);
+ return;
+ }
+
+ c2p_unsupported();
+}
+
+
+ /*
+ * Transpose operations on 4 32-bit words
+ */
+
+static inline void transp4(CARD32 d[], unsigned int n, unsigned int m)
+{
+ CARD32 mask = get_mask(n);
+
+ switch (m) {
+ case 1:
+ /* First n x 1 block */
+ _transp(d, 0, 1, n, mask);
+ /* Second n x 1 block */
+ _transp(d, 2, 3, n, mask);
+ return;
+
+ case 2:
+ /* Single n x 2 block */
+ _transp(d, 0, 2, n, mask);
+ _transp(d, 1, 3, n, mask);
+ return;
+ }
+
+ c2p_unsupported();
+}
+
+
+ /*
+ * Transpose operations on 4 32-bit words (reverse order)
+ */
+
+static inline void transp4x(CARD32 d[], unsigned int n, unsigned int m)
+{
+ CARD32 mask = get_mask(n);
+
+ switch (m) {
+ case 2:
+ /* Single n x 2 block */
+ _transp(d, 2, 0, n, mask);
+ _transp(d, 3, 1, n, mask);
+ return;
+ }
+
+ c2p_unsupported();
+}
+
+
+ /*
+ * Transpose operations on 2 32-bit words
+ */
+
+static inline void transp2(CARD32 d[], unsigned int n)
+{
+ CARD32 mask = get_mask(n);
+
+ /* Single n x 1 block */
+ _transp(d, 0, 1, n, mask);
+ return;
+}
+
+
+ /*
+ * Transpose operations on 2 32-bit words (reverse order)
+ */
+
+static inline void transp2x(CARD32 d[], unsigned int n)
+{
+ CARD32 mask = get_mask(n);
+
+ /* Single n x 1 block */
+ _transp(d, 1, 0, n, mask);
+ return;
+}
diff --git a/xorg-server/miext/shadow/shadow.h b/xorg-server/miext/shadow/shadow.h
index 83de22ccc..421ae96a6 100644
--- a/xorg-server/miext/shadow/shadow.h
+++ b/xorg-server/miext/shadow/shadow.h
@@ -96,6 +96,18 @@ shadowInit(ScreenPtr pScreen, ShadowUpdateProc update, ShadowWindowProc window);
extern _X_EXPORT void *shadowAlloc(int width, int height, int bpp);
extern _X_EXPORT void
+ shadowUpdateAfb4(ScreenPtr pScreen, shadowBufPtr pBuf);
+
+extern _X_EXPORT void
+ shadowUpdateAfb8(ScreenPtr pScreen, shadowBufPtr pBuf);
+
+extern _X_EXPORT void
+ shadowUpdateIplan2p4(ScreenPtr pScreen, shadowBufPtr pBuf);
+
+extern _X_EXPORT void
+ shadowUpdateIplan2p8(ScreenPtr pScreen, shadowBufPtr pBuf);
+
+extern _X_EXPORT void
shadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf);
extern _X_EXPORT void
diff --git a/xorg-server/miext/shadow/shafb4.c b/xorg-server/miext/shadow/shafb4.c
new file mode 100644
index 000000000..d88ae1c2c
--- /dev/null
+++ b/xorg-server/miext/shadow/shafb4.c
@@ -0,0 +1,139 @@
+/*
+ * Copyright © 2013 Geert Uytterhoeven
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Based on shpacked.c, which is Copyright © 2000 Keith Packard
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include <X11/fonts/font.h>
+#include "dixfontstr.h"
+#include <X11/fonts/fontstruct.h>
+#include "mi.h"
+#include "regionstr.h"
+#include "globals.h"
+#include "gcstruct.h"
+#include "shadow.h"
+#include "fb.h"
+#include "c2p_core.h"
+
+
+ /*
+ * Perform a full C2P step on 32 4-bit pixels, stored in 4 32-bit words
+ * containing
+ * - 32 4-bit chunky pixels on input
+ * - permutated planar data (1 plane per 32-bit word) on output
+ */
+
+static void c2p_32x4(CARD32 d[4])
+{
+ transp4(d, 16, 2);
+ transp4(d, 8, 1);
+ transp4(d, 4, 2);
+ transp4(d, 2, 1);
+ transp4(d, 1, 2);
+}
+
+
+ /*
+ * Store a full block of permutated planar data after c2p conversion
+ */
+
+static inline void store_afb4(void *dst, unsigned int stride,
+ const CARD32 d[4])
+{
+ CARD8 *p = dst;
+
+ *(CARD32 *)p = d[3]; p += stride;
+ *(CARD32 *)p = d[1]; p += stride;
+ *(CARD32 *)p = d[2]; p += stride;
+ *(CARD32 *)p = d[0]; p += stride;
+}
+
+
+void
+shadowUpdateAfb4(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+ RegionPtr damage = shadowDamage(pBuf);
+ PixmapPtr pShadow = pBuf->pPixmap;
+ int nbox = RegionNumRects(damage);
+ BoxPtr pbox = RegionRects(damage);
+ FbBits *shaBase;
+ CARD32 *shaLine, *sha;
+ FbStride shaStride;
+ int scrLine;
+ _X_UNUSED int shaBpp, shaXoff, shaYoff;
+ int x, y, w, h;
+ int i, n;
+ CARD32 *win;
+ CARD32 off, winStride;
+ union {
+ CARD8 bytes[16];
+ CARD32 words[4];
+ } d;
+
+ fbGetDrawable(&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff,
+ shaYoff);
+ if (sizeof(FbBits) != sizeof(CARD32))
+ shaStride = shaStride * sizeof(FbBits) / sizeof(CARD32);
+
+ while (nbox--) {
+ x = pbox->x1;
+ y = pbox->y1;
+ w = pbox->x2 - pbox->x1;
+ h = pbox->y2 - pbox->y1;
+
+ scrLine = (x & -32) / 2;
+ shaLine = (CARD32 *)shaBase + y * shaStride + scrLine / sizeof(CARD32);
+
+ off = scrLine / 4; /* byte offset in bitplane scanline */
+ n = ((x & 31) + w + 31) / 32; /* number of c2p units in scanline */
+
+ while (h--) {
+ sha = shaLine;
+ win = (CARD32 *) (*pBuf->window) (pScreen,
+ y,
+ off,
+ SHADOW_WINDOW_WRITE,
+ &winStride,
+ pBuf->closure);
+ if (!win)
+ return;
+ for (i = 0; i < n; i++) {
+ memcpy(d.bytes, sha, sizeof(d.bytes));
+ c2p_32x4(d.words);
+ store_afb4(win++, winStride, d.words);
+ sha += sizeof(d.bytes) / sizeof(*sha);
+ }
+ shaLine += shaStride;
+ y++;
+ }
+ pbox++;
+ }
+}
diff --git a/xorg-server/miext/shadow/shafb8.c b/xorg-server/miext/shadow/shafb8.c
new file mode 100644
index 000000000..8d84bfa01
--- /dev/null
+++ b/xorg-server/miext/shadow/shafb8.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2013 Geert Uytterhoeven
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Based on shpacked.c, which is Copyright © 2000 Keith Packard
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include <X11/fonts/font.h>
+#include "dixfontstr.h"
+#include <X11/fonts/fontstruct.h>
+#include "mi.h"
+#include "regionstr.h"
+#include "globals.h"
+#include "gcstruct.h"
+#include "shadow.h"
+#include "fb.h"
+#include "c2p_core.h"
+
+
+ /*
+ * Perform a full C2P step on 32 8-bit pixels, stored in 8 32-bit words
+ * containing
+ * - 32 8-bit chunky pixels on input
+ * - permutated planar data (1 plane per 32-bit word) on output
+ */
+
+static void c2p_32x8(CARD32 d[8])
+{
+ transp8(d, 16, 4);
+ transp8(d, 8, 2);
+ transp8(d, 4, 1);
+ transp8(d, 2, 4);
+ transp8(d, 1, 2);
+}
+
+
+ /*
+ * Store a full block of permutated planar data after c2p conversion
+ */
+
+static inline void store_afb8(void *dst, unsigned int stride,
+ const CARD32 d[8])
+{
+ CARD8 *p = dst;
+
+ *(CARD32 *)p = d[7]; p += stride;
+ *(CARD32 *)p = d[5]; p += stride;
+ *(CARD32 *)p = d[3]; p += stride;
+ *(CARD32 *)p = d[1]; p += stride;
+ *(CARD32 *)p = d[6]; p += stride;
+ *(CARD32 *)p = d[4]; p += stride;
+ *(CARD32 *)p = d[2]; p += stride;
+ *(CARD32 *)p = d[0]; p += stride;
+}
+
+
+void
+shadowUpdateAfb8(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+ RegionPtr damage = shadowDamage(pBuf);
+ PixmapPtr pShadow = pBuf->pPixmap;
+ int nbox = RegionNumRects(damage);
+ BoxPtr pbox = RegionRects(damage);
+ FbBits *shaBase;
+ CARD32 *shaLine, *sha;
+ FbStride shaStride;
+ int scrLine;
+ _X_UNUSED int shaBpp, shaXoff, shaYoff;
+ int x, y, w, h;
+ int i, n;
+ CARD32 *win;
+ CARD32 off, winStride;
+ union {
+ CARD8 bytes[32];
+ CARD32 words[8];
+ } d;
+
+ fbGetDrawable(&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff,
+ shaYoff);
+ if (sizeof(FbBits) != sizeof(CARD32))
+ shaStride = shaStride * sizeof(FbBits) / sizeof(CARD32);
+
+ while (nbox--) {
+ x = pbox->x1;
+ y = pbox->y1;
+ w = pbox->x2 - pbox->x1;
+ h = pbox->y2 - pbox->y1;
+
+ scrLine = x & -32;
+ shaLine = (CARD32 *)shaBase + y * shaStride + scrLine / sizeof(CARD32);
+
+ off = scrLine / 8; /* byte offset in bitplane scanline */
+ n = ((x & 31) + w + 31) / 32; /* number of c2p units in scanline */
+
+ while (h--) {
+ sha = shaLine;
+ win = (CARD32 *) (*pBuf->window) (pScreen,
+ y,
+ off,
+ SHADOW_WINDOW_WRITE,
+ &winStride,
+ pBuf->closure);
+ if (!win)
+ return;
+ for (i = 0; i < n; i++) {
+ memcpy(d.bytes, sha, sizeof(d.bytes));
+ c2p_32x8(d.words);
+ store_afb8(win++, winStride, d.words);
+ sha += sizeof(d.bytes) / sizeof(*sha);
+ }
+ shaLine += shaStride;
+ y++;
+ }
+ pbox++;
+ }
+}
diff --git a/xorg-server/miext/shadow/shiplan2p4.c b/xorg-server/miext/shadow/shiplan2p4.c
new file mode 100644
index 000000000..0e46bae7a
--- /dev/null
+++ b/xorg-server/miext/shadow/shiplan2p4.c
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2013 Geert Uytterhoeven
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Based on shpacked.c, which is Copyright © 2000 Keith Packard
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include <X11/fonts/font.h>
+#include "dixfontstr.h"
+#include <X11/fonts/fontstruct.h>
+#include "mi.h"
+#include "regionstr.h"
+#include "globals.h"
+#include "gcstruct.h"
+#include "shadow.h"
+#include "fb.h"
+#include "c2p_core.h"
+
+
+ /*
+ * Perform a full C2P step on 16 4-bit pixels, stored in 2 32-bit words
+ * containing
+ * - 16 4-bit chunky pixels on input
+ * - permutated planar data (2 planes per 32-bit word) on output
+ */
+
+static void c2p_16x4(CARD32 d[2])
+{
+ transp2(d, 8);
+ transp2(d, 2);
+ transp2x(d, 1);
+ transp2(d, 16);
+ transp2(d, 4);
+ transp2(d, 1);
+}
+
+
+ /*
+ * Store a full block of iplan2p4 data after c2p conversion
+ */
+
+static inline void store_iplan2p4(void *dst, const CARD32 d[2])
+{
+ CARD32 *p = dst;
+
+ *p++ = d[0];
+ *p++ = d[1];
+}
+
+
+void
+shadowUpdateIplan2p4(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+ RegionPtr damage = shadowDamage(pBuf);
+ PixmapPtr pShadow = pBuf->pPixmap;
+ int nbox = RegionNumRects(damage);
+ BoxPtr pbox = RegionRects(damage);
+ FbBits *shaBase;
+ CARD16 *shaLine, *sha;
+ FbStride shaStride;
+ int scrLine;
+ _X_UNUSED int shaBpp, shaXoff, shaYoff;
+ int x, y, w, h;
+ int i, n;
+ CARD16 *win;
+ _X_UNUSED CARD32 winSize;
+ union {
+ CARD8 bytes[8];
+ CARD32 words[2];
+ } d;
+
+ fbGetDrawable(&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff,
+ shaYoff);
+ shaStride *= sizeof(FbBits) / sizeof(CARD16);
+
+ while (nbox--) {
+ x = pbox->x1;
+ y = pbox->y1;
+ w = pbox->x2 - pbox->x1;
+ h = pbox->y2 - pbox->y1;
+
+ scrLine = (x & -16) / 2;
+ shaLine = (CARD16 *)shaBase + y * shaStride + scrLine / sizeof(CARD16);
+
+ n = ((x & 15) + w + 15) / 16; /* number of c2p units in scanline */
+
+ while (h--) {
+ sha = shaLine;
+ win = (CARD16 *) (*pBuf->window) (pScreen,
+ y,
+ scrLine,
+ SHADOW_WINDOW_WRITE,
+ &winSize,
+ pBuf->closure);
+ if (!win)
+ return;
+ for (i = 0; i < n; i++) {
+ memcpy(d.bytes, sha, sizeof(d.bytes));
+ c2p_16x4(d.words);
+ store_iplan2p4(win, d.words);
+ sha += sizeof(d.bytes) / sizeof(*sha);
+ win += sizeof(d.bytes) / sizeof(*win);
+ }
+ shaLine += shaStride;
+ y++;
+ }
+ pbox++;
+ }
+}
diff --git a/xorg-server/miext/shadow/shiplan2p8.c b/xorg-server/miext/shadow/shiplan2p8.c
new file mode 100644
index 000000000..17d6a132e
--- /dev/null
+++ b/xorg-server/miext/shadow/shiplan2p8.c
@@ -0,0 +1,137 @@
+/*
+ * Copyright © 2013 Geert Uytterhoeven
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Based on shpacked.c, which is Copyright © 2000 Keith Packard
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <X11/X.h>
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include <X11/fonts/font.h>
+#include "dixfontstr.h"
+#include <X11/fonts/fontstruct.h>
+#include "mi.h"
+#include "regionstr.h"
+#include "globals.h"
+#include "gcstruct.h"
+#include "shadow.h"
+#include "fb.h"
+#include "c2p_core.h"
+
+
+ /*
+ * Perform a full C2P step on 16 8-bit pixels, stored in 4 32-bit words
+ * containing
+ * - 16 8-bit chunky pixels on input
+ * - permutated planar data (2 planes per 32-bit word) on output
+ */
+
+static void c2p_16x8(CARD32 d[4])
+{
+ transp4(d, 8, 2);
+ transp4(d, 1, 2);
+ transp4x(d, 16, 2);
+ transp4x(d, 2, 2);
+ transp4(d, 4, 1);
+}
+
+
+ /*
+ * Store a full block of permutated iplan2p8 data after c2p conversion
+ */
+
+static inline void store_iplan2p8(void *dst, const CARD32 d[4])
+{
+ CARD32 *p = dst;
+
+ *p++ = d[1];
+ *p++ = d[3];
+ *p++ = d[0];
+ *p++ = d[2];
+}
+
+
+void
+shadowUpdateIplan2p8(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+ RegionPtr damage = shadowDamage(pBuf);
+ PixmapPtr pShadow = pBuf->pPixmap;
+ int nbox = RegionNumRects(damage);
+ BoxPtr pbox = RegionRects(damage);
+ FbBits *shaBase;
+ CARD16 *shaLine, *sha;
+ FbStride shaStride;
+ int scrLine;
+ _X_UNUSED int shaBpp, shaXoff, shaYoff;
+ int x, y, w, h;
+ int i, n;
+ CARD16 *win;
+ _X_UNUSED CARD32 winSize;
+ union {
+ CARD8 bytes[16];
+ CARD32 words[4];
+ } d;
+
+ fbGetDrawable(&pShadow->drawable, shaBase, shaStride, shaBpp, shaXoff,
+ shaYoff);
+ shaStride *= sizeof(FbBits) / sizeof(CARD16);
+
+ while (nbox--) {
+ x = pbox->x1;
+ y = pbox->y1;
+ w = pbox->x2 - pbox->x1;
+ h = pbox->y2 - pbox->y1;
+
+ scrLine = x & -16;
+ shaLine = (CARD16 *)shaBase + y * shaStride + scrLine / sizeof(CARD16);
+
+ n = ((x & 15) + w + 15) / 16; /* number of c2p units in scanline */
+
+ while (h--) {
+ sha = shaLine;
+ win = (CARD16 *) (*pBuf->window) (pScreen,
+ y,
+ scrLine,
+ SHADOW_WINDOW_WRITE,
+ &winSize,
+ pBuf->closure);
+ if (!win)
+ return;
+ for (i = 0; i < n; i++) {
+ memcpy(d.bytes, sha, sizeof(d.bytes));
+ c2p_16x8(d.words);
+ store_iplan2p8(win, d.words);
+ sha += sizeof(d.bytes) / sizeof(*sha);
+ win += sizeof(d.bytes) / sizeof(*win);
+ }
+ shaLine += shaStride;
+ y++;
+ }
+ pbox++;
+ }
+}
diff --git a/xorg-server/miext/shadow/shpacked.c b/xorg-server/miext/shadow/shpacked.c
index d2b2e5e24..5ef18f86d 100644
--- a/xorg-server/miext/shadow/shpacked.c
+++ b/xorg-server/miext/shadow/shpacked.c
@@ -98,7 +98,6 @@ shadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
i = width;
width -= i;
scr += i;
-#define PickBit(a,i) (((a) >> (i)) & 1)
memcpy(win, sha, i * sizeof(FbBits));
sha += i;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 20:31:57 +0000