pixman: Branch 'master' - 3 commits
Aaron Plattner
aplattner at kemper.freedesktop.org
Tue Aug 14 16:28:46 PDT 2007
pixman/pixman-compose.c | 153 ++++++++++++++++++++++--------------------------
1 files changed, 73 insertions(+), 80 deletions(-)
New commits:
diff-tree d9b989c890724480d27aec471d5f5fbcc09c0a61 (from 7bdb9840eb414b41ad41871864baa4f2445d8c05)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Tue Aug 14 16:16:27 2007 -0700
Remove redundant defines.
diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index 6a9a2e7..b48251d 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -993,13 +993,6 @@ fbFetchPixel_x4a4 (pixman_image_t *image
return ((pixel & 0xf) | ((pixel & 0xf) << 4)) << 24;
}
-#define Fetch8(l,o) (READ((uint8_t *)(l) + ((o) >> 2)))
-#if IMAGE_BYTE_ORDER == MSBFirst
-#define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4)
-#else
-#define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) >> 4 : Fetch8(l,o) & 0xf)
-#endif
-
static FASTCALL uint32_t
fbFetchPixel_a4 (pixman_image_t *image,
const uint32_t *bits, int offset, const pixman_indexed_t * indexed)
diff-tree 7bdb9840eb414b41ad41871864baa4f2445d8c05 (from 166b78295683d9bcf688702e98259e62f9b25c86)
Author: Arcady Goldmints-Orlov <arcadyg at nvidia.com>
Date: Mon Aug 13 17:37:59 2007 -0700
One more minor wrapping fix
Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index bb1c7c0..6a9a2e7 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -1078,7 +1078,7 @@ static FASTCALL uint32_t
fbFetchPixel_a1 (pixman_image_t *image,
const uint32_t *bits, int offset, const pixman_indexed_t * indexed)
{
- uint32_t pixel = ((uint32_t *)bits)[offset >> 5];
+ uint32_t pixel = READ(bits + (offset >> 5));
uint32_t a;
#if BITMAP_BIT_ORDER == MSBFirst
a = pixel >> (0x1f - (offset & 0x1f));
@@ -1096,7 +1096,7 @@ static FASTCALL uint32_t
fbFetchPixel_g1 (pixman_image_t *image,
const uint32_t *bits, int offset, const pixman_indexed_t * indexed)
{
- uint32_t pixel = ((uint32_t *)bits)[offset >> 5];
+ uint32_t pixel = READ(bits + (offset >> 5));
uint32_t a;
#if BITMAP_BIT_ORDER == MSBFirst
a = pixel >> (0x1f - (offset & 0x1f));
diff-tree 166b78295683d9bcf688702e98259e62f9b25c86 (from 7b1d0c091dd5ae8797b6f7a0ab3d40d5c3676fe9)
Author: Arcady Goldmints-Orlov <arcadyg at nvidia.com>
Date: Mon Aug 13 15:20:18 2007 -0700
Remove unnecessary wrapping from fbFetch/fbStore.
These functions fetch from a picture to a scanline buffer, or store
from a scanline buffer to a picture. Since pixman allocates its own
scanline buffer, we don't need to wrap accesses to it.
Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c
index 2082cb6..bb1c7c0 100644
--- a/pixman/pixman-compose.c
+++ b/pixman/pixman-compose.c
@@ -134,7 +134,7 @@ fbFetch_x8r8g8b8 (pixman_image_t *image,
const uint32_t *pixel = (const uint32_t *)bits + x;
const uint32_t *end = pixel + width;
while (pixel < end) {
- WRITE(buffer++, READ(pixel++) | 0xff000000);
+ *buffer++ = READ(pixel++) | 0xff000000;
}
}
@@ -145,10 +145,10 @@ fbFetch_a8b8g8r8 (pixman_image_t *image,
const uint32_t *pixel = (uint32_t *)bits + x;
const uint32_t *end = pixel + width;
while (pixel < end) {
- WRITE(buffer++, ((READ(pixel) & 0xff00ff00) |
- ((READ(pixel) >> 16) & 0xff) |
- ((READ(pixel) & 0xff) << 16)));
- ++pixel;
+ uint32_t p = READ(pixel++);
+ *buffer++ = (p & 0xff00ff00) |
+ ((p >> 16) & 0xff) |
+ ((p & 0xff) << 16);
}
}
@@ -159,11 +159,11 @@ fbFetch_x8b8g8r8 (pixman_image_t *image,
const uint32_t *pixel = (uint32_t *)bits + x;
const uint32_t *end = pixel + width;
while (pixel < end) {
- WRITE(buffer++, 0xff000000 |
- ((READ(pixel) & 0x0000ff00) |
- ((READ(pixel) >> 16) & 0xff) |
- ((READ(pixel) & 0xff) << 16)));
- ++pixel;
+ uint32_t p = READ(pixel++);
+ *buffer++ = 0xff000000 |
+ (p & 0x0000ff00) |
+ ((p >> 16) & 0xff) |
+ ((p & 0xff) << 16);
}
}
@@ -176,7 +176,7 @@ fbFetch_r8g8b8 (pixman_image_t *image,
while (pixel < end) {
uint32_t b = Fetch24(pixel) | 0xff000000;
pixel += 3;
- WRITE(buffer++, b);
+ *buffer++ = b;
}
}
@@ -197,7 +197,7 @@ fbFetch_b8g8r8 (pixman_image_t *image,
b |= (READ(pixel++) << 8);
b |= (READ(pixel++));
#endif
- WRITE(buffer++, b);
+ *buffer++ = b;
}
}
@@ -209,13 +209,13 @@ fbFetch_r5g6b5 (pixman_image_t *image,
const uint16_t *pixel = (const uint16_t *)bits + x;
const uint16_t *end = pixel + width;
while (pixel < end) {
- uint32_t p = READ(pixel++);
+ uint32_t p = READ(pixel++);
uint32_t r = (((p) << 3) & 0xf8) |
(((p) << 5) & 0xfc00) |
(((p) << 8) & 0xf80000);
r |= (r >> 5) & 0x70007;
r |= (r >> 6) & 0x300;
- WRITE(buffer++, 0xff000000 | r);
+ *buffer++ = 0xff000000 | r;
}
}
@@ -233,7 +233,7 @@ fbFetch_b5g6r5 (pixman_image_t *image,
b = ((p & 0xf800) | ((p & 0xe000) >> 5)) >> 8;
g = ((p & 0x07e0) | ((p & 0x0600) >> 6)) << 5;
r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -252,7 +252,7 @@ fbFetch_a1r5g5b5 (pixman_image_t *image,
r = ((p & 0x7c00) | ((p & 0x7000) >> 5)) << 9;
g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
b = ((p & 0x001c) | ((p & 0x001f) << 5)) >> 2;
- WRITE(buffer++, (a | r | g | b));
+ *buffer++ = a | r | g | b;
}
}
@@ -270,7 +270,7 @@ fbFetch_x1r5g5b5 (pixman_image_t *image,
r = ((p & 0x7c00) | ((p & 0x7000) >> 5)) << 9;
g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
b = ((p & 0x001c) | ((p & 0x001f) << 5)) >> 2;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -289,7 +289,7 @@ fbFetch_a1b5g5r5 (pixman_image_t *image,
b = ((p & 0x7c00) | ((p & 0x7000) >> 5)) >> 7;
g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
- WRITE(buffer++, (a | r | g | b));
+ *buffer++ = a | r | g | b;
}
}
@@ -307,7 +307,7 @@ fbFetch_x1b5g5r5 (pixman_image_t *image,
b = ((p & 0x7c00) | ((p & 0x7000) >> 5)) >> 7;
g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -325,7 +325,7 @@ fbFetch_a4r4g4b4 (pixman_image_t *image,
r = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) << 12;
g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
b = ((p & 0x000f) | ((p & 0x000f) << 4));
- WRITE(buffer++, (a | r | g | b));
+ *buffer++ = a | r | g | b;
}
}
@@ -343,7 +343,7 @@ fbFetch_x4r4g4b4 (pixman_image_t *image,
r = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) << 12;
g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
b = ((p & 0x000f) | ((p & 0x000f) << 4));
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -362,7 +362,7 @@ fbFetch_a4b4g4r4 (pixman_image_t *image,
b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) >> 4;
g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
r = ((p & 0x000f) | ((p & 0x000f) << 4)) << 16;
- WRITE(buffer++, (a | r | g | b));
+ *buffer++ = a | r | g | b;
}
}
@@ -380,7 +380,7 @@ fbFetch_x4b4g4r4 (pixman_image_t *image,
b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) >> 4;
g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
r = ((p & 0x000f) | ((p & 0x000f) << 4)) << 16;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -391,7 +391,7 @@ fbFetch_a8 (pixman_image_t *image,
const uint8_t *pixel = (const uint8_t *)bits + x;
const uint8_t *end = pixel + width;
while (pixel < end) {
- WRITE(buffer++, READ(pixel++) << 24);
+ *buffer++ = READ(pixel++) << 24;
}
}
@@ -412,7 +412,7 @@ fbFetch_r3g3b2 (pixman_image_t *image,
((p & 0x03) << 2) |
((p & 0x03) << 4) |
((p & 0x03) << 6));
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -435,7 +435,7 @@ fbFetch_b2g3r3 (pixman_image_t *image,
r = (((p & 0x07) ) |
((p & 0x07) << 3) |
((p & 0x06) << 6)) << 16;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -453,7 +453,7 @@ fbFetch_a2r2g2b2 (pixman_image_t *image,
r = ((p & 0x30) * 0x55) << 12;
g = ((p & 0x0c) * 0x55) << 6;
b = ((p & 0x03) * 0x55);
- WRITE(buffer++, a|r|g|b);
+ *buffer++ = a|r|g|b;
}
}
@@ -471,7 +471,7 @@ fbFetch_a2b2g2r2 (pixman_image_t *image,
b = ((p & 0x30) * 0x55) >> 6;
g = ((p & 0x0c) * 0x55) << 6;
r = ((p & 0x03) * 0x55) << 16;
- WRITE(buffer++, a|r|g|b);
+ *buffer++ = a|r|g|b;
}
}
@@ -483,7 +483,7 @@ fbFetch_c8 (pixman_image_t *image,
const uint8_t *end = pixel + width;
while (pixel < end) {
uint32_t p = READ(pixel++);
- WRITE(buffer++, indexed->rgba[p]);
+ *buffer++ = indexed->rgba[p];
}
}
@@ -495,11 +495,11 @@ fbFetch_x4a4 (pixman_image_t *image,
const uint8_t *end = pixel + width;
while (pixel < end) {
uint8_t p = READ(pixel++) & 0xf;
- WRITE(buffer++, (p | (p << 4)) << 24);
+ *buffer++ = (p | (p << 4)) << 24;
}
}
-#define Fetch8(l,o) (((uint8_t *) (l))[(o) >> 2])
+#define Fetch8(l,o) (READ((uint8_t *)(l) + ((o) >> 2)))
#if IMAGE_BYTE_ORDER == MSBFirst
#define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4)
#else
@@ -515,7 +515,7 @@ fbFetch_a4 (pixman_image_t *image,
uint32_t p = Fetch4(bits, i + x);
p |= p << 4;
- WRITE(buffer++, p << 24);
+ *buffer++ = p << 24;
}
}
@@ -531,7 +531,7 @@ fbFetch_r1g2b1 (pixman_image_t *image,
r = ((p & 0x8) * 0xff) << 13;
g = ((p & 0x6) * 0x55) << 7;
b = ((p & 0x1) * 0xff);
- WRITE(buffer++, 0xff000000|r|g|b);
+ *buffer++ = 0xff000000|r|g|b;
}
}
@@ -547,7 +547,7 @@ fbFetch_b1g2r1 (pixman_image_t *image,
b = ((p & 0x8) * 0xff) >> 3;
g = ((p & 0x6) * 0x55) << 7;
r = ((p & 0x1) * 0xff) << 16;
- WRITE(buffer++, 0xff000000|r|g|b);
+ *buffer++ = 0xff000000|r|g|b;
}
}
@@ -564,7 +564,7 @@ fbFetch_a1r1g1b1 (pixman_image_t *image,
r = ((p & 0x4) * 0xff) << 14;
g = ((p & 0x2) * 0xff) << 7;
b = ((p & 0x1) * 0xff);
- WRITE(buffer++, a|r|g|b);
+ *buffer++ = a|r|g|b;
}
}
@@ -581,7 +581,7 @@ fbFetch_a1b1g1r1 (pixman_image_t *image,
r = ((p & 0x4) * 0xff) >> 3;
g = ((p & 0x2) * 0xff) << 7;
b = ((p & 0x1) * 0xff) << 16;
- WRITE(buffer++, a|r|g|b);
+ *buffer++ = a|r|g|b;
}
}
@@ -593,7 +593,7 @@ fbFetch_c4 (pixman_image_t *image,
for (i = 0; i < width; ++i) {
uint32_t p = Fetch4(bits, i + x);
- WRITE(buffer++, indexed->rgba[p]);
+ *buffer++ = indexed->rgba[p];
}
}
@@ -604,7 +604,7 @@ fbFetch_a1 (pixman_image_t *image,
{
int i;
for (i = 0; i < width; ++i) {
- uint32_t p = ((uint32_t *)bits)[(i + x) >> 5];
+ uint32_t p = READ(bits + ((i + x) >> 5));
uint32_t a;
#if BITMAP_BIT_ORDER == MSBFirst
a = p >> (0x1f - ((i+x) & 0x1f));
@@ -615,7 +615,7 @@ fbFetch_a1 (pixman_image_t *image,
a |= a << 1;
a |= a << 2;
a |= a << 4;
- WRITE(buffer++, a << 24);
+ *buffer++ = a << 24;
}
}
@@ -625,7 +625,7 @@ fbFetch_g1 (pixman_image_t *image,
{
int i;
for (i = 0; i < width; ++i) {
- uint32_t p = ((uint32_t *)bits)[(i+x) >> 5];
+ uint32_t p = READ(bits + ((i+x) >> 5));
uint32_t a;
#if BITMAP_BIT_ORDER == MSBFirst
a = p >> (0x1f - ((i+x) & 0x1f));
@@ -633,7 +633,7 @@ fbFetch_g1 (pixman_image_t *image,
a = p >> ((i+x) & 0x1f);
#endif
a = a & 1;
- WRITE(buffer++, indexed->rgba[a]);
+ *buffer++ = indexed->rgba[a];
}
}
@@ -993,7 +993,7 @@ fbFetchPixel_x4a4 (pixman_image_t *image
return ((pixel & 0xf) | ((pixel & 0xf) << 4)) << 24;
}
-#define Fetch8(l,o) (((uint8_t *) (l))[(o) >> 2])
+#define Fetch8(l,o) (READ((uint8_t *)(l) + ((o) >> 2)))
#if IMAGE_BYTE_ORDER == MSBFirst
#define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4)
#else
@@ -1185,7 +1185,7 @@ fbStore_x8r8g8b8 (pixman_image_t *image,
int i;
uint32_t *pixel = (uint32_t *)bits + x;
for (i = 0; i < width; ++i)
- WRITE(pixel++, READ(values + i) & 0xffffff);
+ WRITE(pixel++, values[i] & 0xffffff);
}
static FASTCALL void
@@ -1195,7 +1195,7 @@ fbStore_a8b8g8r8 (pixman_image_t *image,
int i;
uint32_t *pixel = (uint32_t *)bits + x;
for (i = 0; i < width; ++i)
- WRITE(pixel++, (READ(values + i) & 0xff00ff00) | ((READ(values + i) >> 16) & 0xff) | ((READ(values + i) & 0xff) << 16));
+ WRITE(pixel++, (values[i] & 0xff00ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16));
}
static FASTCALL void
@@ -1205,7 +1205,7 @@ fbStore_x8b8g8r8 (pixman_image_t *image,
int i;
uint32_t *pixel = (uint32_t *)bits + x;
for (i = 0; i < width; ++i)
- WRITE(pixel++, (READ(values + i) & 0x0000ff00) | ((READ(values + i) >> 16) & 0xff) | ((READ(values + i) & 0xff) << 16));
+ WRITE(pixel++, (values[i] & 0x0000ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16));
}
static FASTCALL void
@@ -1216,7 +1216,7 @@ fbStore_r8g8b8 (pixman_image_t *image,
int i;
uint8_t *pixel = ((uint8_t *) bits) + 3*x;
for (i = 0; i < width; ++i) {
- Store24(pixel, READ(values + i));
+ Store24(pixel, values[i]);
pixel += 3;
}
}
@@ -1228,7 +1228,7 @@ fbStore_b8g8r8 (pixman_image_t *image,
int i;
uint8_t *pixel = ((uint8_t *) bits) + 3*x;
for (i = 0; i < width; ++i) {
- uint32_t val = READ(values + i);
+ uint32_t val = values[i];
#if IMAGE_BYTE_ORDER == MSBFirst
WRITE(pixel++, Blue(val));
WRITE(pixel++, Green(val));
@@ -1248,7 +1248,7 @@ fbStore_r5g6b5 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- uint32_t s = READ(values + i);
+ uint32_t s = values[i];
WRITE(pixel++, ((s >> 3) & 0x001f) |
((s >> 5) & 0x07e0) |
((s >> 8) & 0xf800));
@@ -1262,7 +1262,7 @@ fbStore_b5g6r5 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((b << 8) & 0xf800) |
((g << 3) & 0x07e0) |
((r >> 3) ));
@@ -1276,7 +1276,7 @@ fbStore_a1r5g5b5 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a << 8) & 0x8000) |
((r << 7) & 0x7c00) |
((g << 2) & 0x03e0) |
@@ -1291,7 +1291,7 @@ fbStore_x1r5g5b5 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((r << 7) & 0x7c00) |
((g << 2) & 0x03e0) |
((b >> 3) ));
@@ -1305,7 +1305,7 @@ fbStore_a1b5g5r5 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a << 8) & 0x8000) |
((b << 7) & 0x7c00) |
((g << 2) & 0x03e0) |
@@ -1320,7 +1320,7 @@ fbStore_x1b5g5r5 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((b << 7) & 0x7c00) |
((g << 2) & 0x03e0) |
((r >> 3) ));
@@ -1334,7 +1334,7 @@ fbStore_a4r4g4b4 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a << 8) & 0xf000) |
((r << 4) & 0x0f00) |
((g ) & 0x00f0) |
@@ -1349,7 +1349,7 @@ fbStore_x4r4g4b4 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((r << 4) & 0x0f00) |
((g ) & 0x00f0) |
((b >> 4) ));
@@ -1363,7 +1363,7 @@ fbStore_a4b4g4r4 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a << 8) & 0xf000) |
((b << 4) & 0x0f00) |
((g ) & 0x00f0) |
@@ -1378,7 +1378,7 @@ fbStore_x4b4g4r4 (pixman_image_t *image,
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((b << 4) & 0x0f00) |
((g ) & 0x00f0) |
((r >> 4) ));
@@ -1392,7 +1392,7 @@ fbStore_a8 (pixman_image_t *image,
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- WRITE(pixel++, READ(values + i) >> 24);
+ WRITE(pixel++, values[i] >> 24);
}
}
@@ -1403,7 +1403,7 @@ fbStore_r3g3b2 (pixman_image_t *image,
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++,
((r ) & 0xe0) |
((g >> 3) & 0x1c) |
@@ -1418,7 +1418,7 @@ fbStore_b2g3r3 (pixman_image_t *image,
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++,
((b ) & 0xc0) |
((g >> 2) & 0x1c) |
@@ -1433,7 +1433,7 @@ fbStore_a2r2g2b2 (pixman_image_t *image,
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a ) & 0xc0) |
((r >> 2) & 0x30) |
((g >> 4) & 0x0c) |
@@ -1448,7 +1448,7 @@ fbStore_c8 (pixman_image_t *image,
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- WRITE(pixel++, miIndexToEnt24(indexed,READ(values + i)));
+ WRITE(pixel++, miIndexToEnt24(indexed,values[i]));
}
}
@@ -1459,11 +1459,11 @@ fbStore_x4a4 (pixman_image_t *image,
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- WRITE(pixel++, READ(values + i) >> 28);
+ WRITE(pixel++, values[i] >> 28);
}
}
-#define Store8(l,o,v) (((uint8_t *) l)[(o) >> 3] = (v))
+#define Store8(l,o,v) (WRITE((uint8_t *)(l) + ((o) >> 3), (v)))
#if IMAGE_BYTE_ORDER == MSBFirst
#define Store4(l,o,v) Store8(l,o,((o) & 4 ? \
(Fetch8(l,o) & 0xf0) | (v) : \
@@ -1480,7 +1480,7 @@ fbStore_a4 (pixman_image_t *image,
{
int i;
for (i = 0; i < width; ++i) {
- Store4(bits, i + x, READ(values + i)>>28);
+ Store4(bits, i + x, values[i]>>28);
}
}
@@ -1492,7 +1492,7 @@ fbStore_r1g2b1 (pixman_image_t *image,
for (i = 0; i < width; ++i) {
uint32_t pixel;
- Split(READ(values + i));
+ Split(values[i]);
pixel = (((r >> 4) & 0x8) |
((g >> 5) & 0x6) |
((b >> 7) ));
@@ -1508,7 +1508,7 @@ fbStore_b1g2r1 (pixman_image_t *image,
for (i = 0; i < width; ++i) {
uint32_t pixel;
- Split(READ(values + i));
+ Split(values[i]);
pixel = (((b >> 4) & 0x8) |
((g >> 5) & 0x6) |
((r >> 7) ));
@@ -1523,7 +1523,7 @@ fbStore_a1r1g1b1 (pixman_image_t *image,
int i;
for (i = 0; i < width; ++i) {
uint32_t pixel;
- Splita(READ(values + i));
+ Splita(values[i]);
pixel = (((a >> 4) & 0x8) |
((r >> 5) & 0x4) |
((g >> 6) & 0x2) |
@@ -1539,7 +1539,7 @@ fbStore_a1b1g1r1 (pixman_image_t *image,
int i;
for (i = 0; i < width; ++i) {
uint32_t pixel;
- Splita(READ(values + i));
+ Splita(values[i]);
pixel = (((a >> 4) & 0x8) |
((b >> 5) & 0x4) |
((g >> 6) & 0x2) |
@@ -1556,7 +1556,7 @@ fbStore_c4 (pixman_image_t *image,
for (i = 0; i < width; ++i) {
uint32_t pixel;
- pixel = miIndexToEnt24(indexed, READ(values + i));
+ pixel = miIndexToEnt24(indexed, values[i]);
Store4(bits, i + x, pixel);
}
}
@@ -1570,7 +1570,7 @@ fbStore_a1 (pixman_image_t *image,
uint32_t *pixel = ((uint32_t *) bits) + ((i+x) >> 5);
uint32_t mask = FbStipMask((i+x) & 0x1f, 1);
- uint32_t v = READ(values + i) & 0x80000000 ? mask : 0;
+ uint32_t v = values[i] & 0x80000000 ? mask : 0;
WRITE(pixel, (READ(pixel) & ~mask) | v);
}
}
@@ -1584,7 +1584,7 @@ fbStore_g1 (pixman_image_t *image,
uint32_t *pixel = ((uint32_t *) bits) + ((i+x) >> 5);
uint32_t mask = FbStipMask((i+x) & 0x1f, 1);
- uint32_t v = miIndexToEntY24(indexed,READ(values + i)) ? mask : 0;
+ uint32_t v = miIndexToEntY24(indexed,values[i]) ? mask : 0;
WRITE(pixel, (READ(pixel) & ~mask) | v);
}
}
More information about the xorg-commit
mailing list