Commit 8b3bdef

committed

Add support for drawing to more frame buffer formats

1 parent e3dd5b7 commit 8b3bdefCopy full SHA for 8b3bdef

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,17 +38,24 @@ typedef struct { // Data stored for FONT AS A WHOLE:`
`38`	`38`
`39`	`39`	`void fb_gfx_fillRect(fb_data_t *fb, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color)`
`40`	`40`	`{`
`41`		`- int32_t line_step = (fb->width - w) * 3;`
`42`		`- uint8_t data = fb->data + ((x + (y fb->width)) * 3);`
	`41`	`+ int32_t line_step = (fb->width - w) * fb->bytes_per_pixel;`
	`42`	`+ uint8_t data = fb->data + ((x + (y fb->width)) * fb->bytes_per_pixel);`
`43`	`43`	`uint8_t c0 = color >> 16;`
`44`	`44`	`uint8_t c1 = color >> 8;`
`45`	`45`	`uint8_t c2 = color;`
`46`	`46`	`for (int i=0; i<h; i++){`
`47`	`47`	`for (int j=0; j<w; j++){`
`48`		`- data[0] = c0;`
`49`		`- data[1] = c1;`
`50`		`- data[2] = c2;`
`51`		`- data+=3;`
	`48`	`+ if(fb->bytes_per_pixel == 2){`
	`49`	`+ data[0] = c1;`
	`50`	`+ data[1] = c2;`
	`51`	`+ } else if(fb->bytes_per_pixel == 1){`
	`52`	`+ data[0] = c2;`
	`53`	`+ } else {`
	`54`	`+ data[0] = c0;`
	`55`	`+ data[1] = c1;`
	`56`	`+ data[2] = c2;`
	`57`	`+ }`
	`58`	`+ data+=fb->bytes_per_pixel;`
`52`	`59`	`}`
`53`	`60`	`data += line_step;`
`54`	`61`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ extern "C" {`
`19`	`19`	`#endif`
`20`	`20`
`21`	`21`	`typedef enum {`
`22`		`- FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565`
	`22`	`+ FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565, FB_GRAY`
`23`	`23`	`} fb_format_t;`
`24`	`24`
`25`	`25`	`typedef struct {`

Comments

(0)