Commit e27f01ef authored by balrog's avatar balrog
Browse files

Use pixel_ops.h in PXA LCD screen drawing.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2983 c046a42c-6fe2-441c-8c8c-71466251a162
parent 85b2d440
...@@ -28,6 +28,18 @@ static inline unsigned int rgb_to_pixel16bgr(unsigned int r, unsigned int g, ...@@ -28,6 +28,18 @@ static inline unsigned int rgb_to_pixel16bgr(unsigned int r, unsigned int g,
return ((b >> 3) << 11) | ((g >> 2) << 5) | (r >> 3); return ((b >> 3) << 11) | ((g >> 2) << 5) | (r >> 3);
} }
static inline unsigned int rgb_to_pixel24(unsigned int r, unsigned int g,
unsigned int b)
{
return (r << 16) | (g << 8) | b;
}
static inline unsigned int rgb_to_pixel24bgr(unsigned int r, unsigned int g,
unsigned int b)
{
return (b << 16) | (g << 8) | r;
}
static inline unsigned int rgb_to_pixel32(unsigned int r, unsigned int g, static inline unsigned int rgb_to_pixel32(unsigned int r, unsigned int g,
unsigned int b) unsigned int b)
{ {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include "vl.h" #include "vl.h"
#include "pixel_ops.h"
typedef void (*drawfn)(uint32_t *, uint8_t *, const uint8_t *, int, int); typedef void (*drawfn)(uint32_t *, uint8_t *, const uint8_t *, int, int);
...@@ -575,36 +576,6 @@ static CPUWriteMemoryFunc *pxa2xx_lcdc_writefn[] = { ...@@ -575,36 +576,6 @@ static CPUWriteMemoryFunc *pxa2xx_lcdc_writefn[] = {
pxa2xx_lcdc_write pxa2xx_lcdc_write
}; };
static inline
uint32_t rgb_to_pixel8(unsigned int r, unsigned int g, unsigned b)
{
return ((r >> 5) << 5) | ((g >> 5) << 2) | (b >> 6);
}
static inline
uint32_t rgb_to_pixel15(unsigned int r, unsigned int g, unsigned b)
{
return ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3);
}
static inline
uint32_t rgb_to_pixel16(unsigned int r, unsigned int g, unsigned b)
{
return ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
}
static inline
uint32_t rgb_to_pixel24(unsigned int r, unsigned int g, unsigned b)
{
return (r << 16) | (g << 8) | b;
}
static inline
uint32_t rgb_to_pixel32(unsigned int r, unsigned int g, unsigned b)
{
return (r << 16) | (g << 8) | b;
}
/* Load new palette for a given DMA channel, convert to internal format */ /* Load new palette for a given DMA channel, convert to internal format */
static void pxa2xx_palette_parse(struct pxa2xx_lcdc_s *s, int ch, int bpp) static void pxa2xx_palette_parse(struct pxa2xx_lcdc_s *s, int ch, int bpp)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment