1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
|
--- libmatchbox/libmb/mbpixbuf.c.orig 2007-05-04 14:41:55.000000000 +0100
+++ libmatchbox/libmb/mbpixbuf.c 2007-05-04 14:41:55.000000000 +0100
@@ -710,46 +710,19 @@
return colnum;
}
-
-static unsigned long
-mb_pixbuf_get_pixel(MBPixbuf *pb, int r, int g, int b, int a)
+/*
+ * Split the mb_pixbuf_get_pixel() function into several specialized
+ * functions which we will inline; this allows us to optimize
+ * mb_pixbuf_img_render_to_drawable_with_gc () by taking some of the
+ * decision taking outside of the double loop
+ */
+
+/*
+ * Get pixel value for rgb values and pixel depth <= 8
+ */
+static inline unsigned long
+mb_pixbuf_get_pixel_le8_rgb (MBPixbuf *pb, int r, int g, int b)
{
- if (pb->depth > 8)
- {
- switch (pb->depth)
- {
- case 15:
- return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
- case 16:
- return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
- case 24:
- case 32:
- switch (pb->byte_order)
- {
- case BYTE_ORD_24_RGB:
- return ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
- case BYTE_ORD_24_RBG:
- return ((r & 0xff) << 16) | ((b & 0xff) << 8) | (g & 0xff);
- case BYTE_ORD_24_BRG:
- return ((b & 0xff) << 16) | ((r & 0xff) << 8) | (g & 0xff);
- case BYTE_ORD_24_BGR:
- return ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
- case BYTE_ORD_24_GRB:
- return ((g & 0xff) << 16) | ((r & 0xff) << 8) | (b & 0xff);
- case BYTE_ORD_24_GBR:
- return ((g & 0xff) << 16) | ((b & 0xff) << 8) | (r & 0xff);
- case BYTE_ORD_32_ARGB:
- return (a << 24) | (r << 16) | (g << 8) | b;
- default:
- return 0;
- }
- default:
- return 0;
- }
- return 0;
- }
-
- /* pb->depth <= 8 */
switch(pb->vis->class)
{
case PseudoColor:
@@ -794,6 +767,111 @@
return 0;
}
+/*
+ * Get pixel value from a pointer to 16bbp value for pixel depth <= 8
+ * and advance the pointer
+ */
+static inline unsigned long
+mb_pixbuf_get_pixel_le8_16bpp_advance (MBPixbuf *pb, unsigned char ** p)
+{
+ unsigned short s = SHORT_FROM_2BYTES(*p);
+ int r, b, g;
+
+ r = (s & 0xf800) >> 8;
+ g = (s & 0x07e0) >> 3;
+ b = (s & 0x001f) << 3;
+
+ *p += 2;
+
+ return mb_pixbuf_get_pixel_le8_rgb (pb, r, g, b);
+}
+
+/*
+ * Get pixel value for rgba values and pixel depth > 8
+ *
+ */
+static inline unsigned long
+mb_pixbuf_get_pixel_gt8_rgba (MBPixbuf *pb, int r, int g, int b, int a)
+{
+ switch (pb->depth)
+ {
+ case 15:
+ switch (pb->byte_order)
+ {
+ case BYTE_ORD_24_RGB:
+ return ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
+ case BYTE_ORD_24_BGR:
+ return ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3);
+ }
+ case 16:
+ switch (pb->byte_order)
+ {
+ case BYTE_ORD_24_RGB:
+ return ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
+ case BYTE_ORD_24_BGR:
+ return ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3);
+ }
+ case 24:
+ case 32:
+ switch (pb->byte_order)
+ {
+ case BYTE_ORD_24_RGB:
+ return ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
+ case BYTE_ORD_24_RBG:
+ return ((r & 0xff) << 16) | ((b & 0xff) << 8) | (g & 0xff);
+ case BYTE_ORD_24_BRG:
+ return ((b & 0xff) << 16) | ((r & 0xff) << 8) | (g & 0xff);
+ case BYTE_ORD_24_BGR:
+ return ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
+ case BYTE_ORD_24_GRB:
+ return ((g & 0xff) << 16) | ((r & 0xff) << 8) | (b & 0xff);
+ case BYTE_ORD_24_GBR:
+ return ((g & 0xff) << 16) | ((b & 0xff) << 8) | (r & 0xff);
+ case BYTE_ORD_32_ARGB:
+ return (a << 24) | (r << 16) | (g << 8) | b;
+ default:
+ return 0;
+ }
+ default:
+ return 0;
+ }
+}
+
+/*
+ * Get pixel value from pointer to 16bpp data for pixel depth > 8
+ * and advance the pointer
+ *
+ * TODO ? We could take the 32bit case out of here, which would allow
+ * to ignore the alpha value for <15, 24>, but we might not gain that
+ * much by this on arm due to the conditional execution.
+ */
+static inline unsigned long
+mb_pixbuf_get_pixel_gt8_16bpp_advance (MBPixbuf *pb, unsigned char ** p,
+ int has_alpha)
+{
+ unsigned short s = SHORT_FROM_2BYTES(*p);
+ int r, b, g, a;
+
+ r = (s & 0xf800) >> 8;
+ g = (s & 0x07e0) >> 3;
+ b = (s & 0x001f) << 3;
+
+ *p += 2;
+
+ a = has_alpha ? *(*p)++ : 0xff;
+
+ return mb_pixbuf_get_pixel_gt8_rgba (pb, r, g, b, a);
+}
+
+static inline unsigned long
+mb_pixbuf_get_pixel(MBPixbuf *pb, int r, int g, int b, int a)
+{
+ if (pb->depth > 8)
+ return mb_pixbuf_get_pixel_gt8_rgba (pb, r, g, b, a);
+
+ return mb_pixbuf_get_pixel_le8_rgb (pb, r, g, b);
+}
+
unsigned long
mb_pixbuf_lookup_x_pixel(MBPixbuf *pb, int r, int g, int b, int a)
{
@@ -1825,7 +1903,6 @@
mb_pixbuf_img_render_to_drawable_with_gc(pb, img, drw, drw_x, drw_y, pb->gc);
}
-
void
mb_pixbuf_img_render_to_drawable_with_gc(MBPixbuf *pb,
MBPixbufImage *img,
@@ -1883,31 +1960,57 @@
if (pb->internal_bytespp == 2)
{
- for(y=0; y<img->height; y++)
- for(x=0; x<img->width; x++)
- {
- /* Below is potentially dangerous.
- */
- pixel = ( *p | (*(p+1) << 8));
-
- p += ((img->has_alpha) ? 3 : 2);
-
- XPutPixel(img->ximg, x, y, pixel);
- }
+ if (pb->depth > 8)
+ {
+ for(y=0; y<img->height; y++)
+ for(x=0; x<img->width; x++)
+ {
+ pixel = mb_pixbuf_get_pixel_gt8_16bpp_advance(pb, &p,
+ img->has_alpha);
+ XPutPixel(img->ximg, x, y, pixel);
+ }
+ }
+ else
+ {
+ for(y=0; y<img->height; y++)
+ for(x=0; x<img->width; x++)
+ {
+ pixel = mb_pixbuf_get_pixel_le8_16bpp_advance(pb, &p);
+ XPutPixel(img->ximg, x, y, pixel);
+ }
+ }
}
else
{
- for(y=0; y<img->height; y++)
+ if (pb->depth > 8)
{
- for(x=0; x<img->width; x++)
+ for(y=0; y<img->height; y++)
{
- r = ( *p++ );
- g = ( *p++ );
- b = ( *p++ );
- a = ((img->has_alpha) ? *p++ : 0xff);
+ for(x=0; x<img->width; x++)
+ {
+ r = ( *p++ );
+ g = ( *p++ );
+ b = ( *p++ );
+ a = ((img->has_alpha) ? *p++ : 0xff);
- pixel = mb_pixbuf_get_pixel(pb, r, g, b, a);
- XPutPixel(img->ximg, x, y, pixel);
+ pixel = mb_pixbuf_get_pixel_gt8_rgba(pb, r, g, b, a);
+ XPutPixel(img->ximg, x, y, pixel);
+ }
+ }
+ }
+ else
+ {
+ for(y=0; y<img->height; y++)
+ {
+ for(x=0; x<img->width; x++)
+ {
+ r = ( *p++ );
+ g = ( *p++ );
+ b = ( *p++ );
+
+ pixel = mb_pixbuf_get_pixel_le8_rgb(pb, r, g, b);
+ XPutPixel(img->ximg, x, y, pixel);
+ }
}
}
}
|
