| ... |
... |
@@ -237,17 +237,6 @@ |
|
237
|
237
|
|
|
238
|
238
|
/* */
|
|
239
|
239
|
|
|
240
|
|
-static const GBlenderBlitFunc*
|
|
241
|
|
-blit_funcs[GBLENDER_TARGET_MAX] =
|
|
242
|
|
-{
|
|
243
|
|
- blit_funcs_gray8,
|
|
244
|
|
- blit_funcs_rgb32,
|
|
245
|
|
- blit_funcs_rgb24,
|
|
246
|
|
- blit_funcs_rgb565,
|
|
247
|
|
- blit_funcs_rgb555
|
|
248
|
|
-};
|
|
249
|
|
-
|
|
250
|
|
-
|
|
251
|
240
|
static int
|
|
252
|
241
|
gblender_blit_init( GBlenderBlit blit,
|
|
253
|
242
|
int dst_x,
|
| ... |
... |
@@ -266,7 +255,6 @@ gblender_blit_init( GBlenderBlit blit, |
|
266
|
255
|
const int src_pitch = glyph->pitch;
|
|
267
|
256
|
int src_width = glyph->width;
|
|
268
|
257
|
int src_height = glyph->rows;
|
|
269
|
|
- GBlenderTargetFormat dst_format;
|
|
270
|
258
|
unsigned char* dst_buffer = target->buffer;
|
|
271
|
259
|
const int dst_pitch = target->pitch;
|
|
272
|
260
|
const int dst_width = target->width;
|
| ... |
... |
@@ -305,18 +293,27 @@ gblender_blit_init( GBlenderBlit blit, |
|
305
|
293
|
|
|
306
|
294
|
switch ( target->mode )
|
|
307
|
295
|
{
|
|
308
|
|
- case gr_pixel_mode_gray: dst_format = GBLENDER_TARGET_GRAY8; break;
|
|
309
|
|
- case gr_pixel_mode_rgb32: dst_format = GBLENDER_TARGET_RGB32; break;
|
|
310
|
|
- case gr_pixel_mode_rgb24: dst_format = GBLENDER_TARGET_RGB24; break;
|
|
311
|
|
- case gr_pixel_mode_rgb565: dst_format = GBLENDER_TARGET_RGB565; break;
|
|
312
|
|
- case gr_pixel_mode_rgb555: dst_format = GBLENDER_TARGET_RGB555; break;
|
|
|
296
|
+ case gr_pixel_mode_gray:
|
|
|
297
|
+ blit->blit_func = blit_funcs_gray8[src_format];
|
|
|
298
|
+ break;
|
|
|
299
|
+ case gr_pixel_mode_rgb32:
|
|
|
300
|
+ blit->blit_func = blit_funcs_rgb32[src_format];
|
|
|
301
|
+ break;
|
|
|
302
|
+ case gr_pixel_mode_rgb24:
|
|
|
303
|
+ blit->blit_func = blit_funcs_rgb24[src_format];
|
|
|
304
|
+ break;
|
|
|
305
|
+ case gr_pixel_mode_rgb565:
|
|
|
306
|
+ blit->blit_func = blit_funcs_rgb565[src_format];
|
|
|
307
|
+ break;
|
|
|
308
|
+ case gr_pixel_mode_rgb555:
|
|
|
309
|
+ blit->blit_func = blit_funcs_rgb555[src_format];
|
|
|
310
|
+ break;
|
|
313
|
311
|
default:
|
|
314
|
312
|
grError = gr_err_bad_target_depth;
|
|
315
|
313
|
return -2;
|
|
316
|
314
|
}
|
|
317
|
315
|
|
|
318
|
316
|
blit->blender = surface->gblender;
|
|
319
|
|
- blit->blit_func = blit_funcs[dst_format][src_format];
|
|
320
|
317
|
|
|
321
|
318
|
if ( dst_x < 0 )
|
|
322
|
319
|
{
|