sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Introduce graphic utils 

to Factorise pixel rendering

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-09-12 15:42:41 +02:00 committed by Sascha Hauer
parent 6ce5bc4624
commit 78b7818fba
4 changed files with 106 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/graphic_utils.h Normal file
View File

@ -0,0 +1,14 @@
/*
* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*
* GPL v2
*/
#ifndef __GRAPHIC_UTILS_H__
#define __GRAPHIC_UTILS_H__
void set_pixel(struct fb_info *info, void *adr, u32 px);
void set_rgb_pixel(struct fb_info *info, void *adr, u8 r, u8 g, u8 b);
void memset_pixel(struct fb_info *info, void* buf, u32 color, size_t size);
#endif /* __GRAPHIC_UTILS_H__ */

2
lib/Makefile
View File

@ -34,4 +34,4 @@ obj-$(CONFIG_UNCOMPRESS) += uncompress.o
obj-$(CONFIG_BCH) += bch.o
obj-$(CONFIG_BITREV) += bitrev.o
obj-$(CONFIG_QSORT) += qsort.o
obj-$(CONFIG_BMP) += bmp.o
obj-$(CONFIG_BMP) += bmp.o graphic_utils.o

25
lib/bmp.c
View File

@ -5,26 +5,7 @@
#include <fb.h>
#include <bmp_layout.h>
#include <asm/byteorder.h>
static inline void set_pixel(struct fb_info *info, void *adr, int r, int g, int b)
{
u32 px;
px = (r >> (8 - info->red.length)) << info->red.offset |
(g >> (8 - info->green.length)) << info->green.offset |
(b >> (8 - info->blue.length)) << info->blue.offset;
switch (info->bits_per_pixel) {
case 8:
break;
case 16:
*(u16 *)adr = px;
break;
case 32:
*(u32 *)adr = px;
break;
}
}
#include <graphic_utils.h>
int bmp_render_file(struct fb_info *info, const char* bmpfile, void* fb,
int startx, int starty, int xres, int yres, void* offscreenbuf)
@ -88,7 +69,7 @@ int bmp_render_file(struct fb_info *info, const char* bmpfile, void* fb,
pixel = *image;
set_pixel(info, adr, color_table[pixel].red,
set_rgb_pixel(info, adr, color_table[pixel].red,
color_table[pixel].green,
color_table[pixel].blue);
adr += info->bits_per_pixel >> 3;
@ -110,7 +91,7 @@ int bmp_render_file(struct fb_info *info, const char* bmpfile, void* fb,
pixel = image;
set_pixel(info, adr, pixel[2], pixel[1],
set_rgb_pixel(info, adr, pixel[2], pixel[1],
pixel[0]);
adr += info->bits_per_pixel >> 3;

88
lib/graphic_utils.c Normal file
View File

@ -0,0 +1,88 @@
#include <common.h>
#include <fb.h>
#include <graphic_utils.h>
static u32 get_pixel(struct fb_info *info, u32 color)
{
u32 px;
u8 t = (color >> 24) & 0xff;
u8 r = (color >> 16) & 0xff;
u8 g = (color >> 8 ) & 0xff;
u8 b = (color >> 0 ) & 0xff;
if (info->grayscale) {
px = (r | g | b) ? 0xffffffff : 0x0;
return px;
}
px = (t >> (8 - info->transp.length)) << info->transp.offset |
(r >> (8 - info->red.length)) << info->red.offset |
(g >> (8 - info->green.length)) << info->green.offset |
(b >> (8 - info->blue.length)) << info->blue.offset;
return px;
}
static void memsetw(void *s, u16 c, size_t n)
{
size_t i;
u16* tmp = s;
for (i = 0; i < n; i++)
*tmp++ = c;
}
static void memsetl(void *s, u32 c, size_t n)
{
size_t i;
u32* tmp = s;
for (i = 0; i < n; i++)
*tmp++ = c;
}
void memset_pixel(struct fb_info *info, void* buf, u32 color, size_t size)
{
u32 px;
u8 *screen = buf;
px = get_pixel(info, color);
switch (info->bits_per_pixel) {
case 8:
memset(screen, (uint8_t)px, size);
break;
case 16:
memsetw(screen, (uint16_t)px, size);
break;
case 32:
case 24:
memsetl(screen, px, size);
break;
}
}
void set_pixel(struct fb_info *info, void *adr, u32 px)
{
switch (info->bits_per_pixel) {
case 8:
break;
case 16:
*(u16 *)adr = px;
break;
case 32:
*(u32 *)adr = px;
break;
}
}
void set_rgb_pixel(struct fb_info *info, void *adr, u8 r, u8 g, u8 b)
{
u32 px;
px = (r >> (8 - info->red.length)) << info->red.offset |
(g >> (8 - info->green.length)) << info->green.offset |
(b >> (8 - info->blue.length)) << info->blue.offset;
set_pixel(info, adr, px);
}