From a7c44b6146e306b13b63b8bececa6b7bc8ed59fb Mon Sep 17 00:00:00 2001
From: Vito Caputo <vcaputo@gnugeneration.com>
Date: Fri, 3 Feb 2017 16:08:01 -0800
Subject: stars: use fb_fragment_put_pixel_unchecked()
drop draw_pixel() duplication
---
src/modules/stars/draw.h | 16 ----------------
src/modules/stars/stars.c | 2 +-
2 files changed, 1 insertion(+), 17 deletions(-)
(limited to 'src')
diff --git a/src/modules/stars/draw.h b/src/modules/stars/draw.h
index 5010374..0b68c00 100644
--- a/src/modules/stars/draw.h
+++ b/src/modules/stars/draw.h
@@ -3,8 +3,6 @@
#include <stdint.h>
-#include "fb.h"
-
/* helper for scaling rgb colors and packing them into an pixel */
static inline uint32_t makergb(uint32_t r, uint32_t g, uint32_t b, float intensity)
{
@@ -15,18 +13,4 @@ static inline uint32_t makergb(uint32_t r, uint32_t g, uint32_t b, float intensi
return (((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff));
}
-static inline int draw_pixel(fb_fragment_t *f, int x, int y, uint32_t pixel)
-{
- uint32_t *pixels = f->buf;
-
- if (y < 0 || y >= f->height || x < 0 || x >= f->width) {
- return 0;
- }
-
- /* FIXME this assumes stride is aligned to 4 */
- pixels[(y * (f->width + (f->stride >> 2))) + x] = pixel;
-
- return 1;
-}
-
#endif
diff --git a/src/modules/stars/stars.c b/src/modules/stars/stars.c
index e009714..0f6c2d5 100644
--- a/src/modules/stars/stars.c
+++ b/src/modules/stars/stars.c
@@ -43,7 +43,7 @@ static void stars(fb_fragment_t *fragment)
for (;;) {
int ret = process_point( u, &rp );
if (ret==0) break;
- if (ret==1) draw_pixel(fragment, rp.x+(width/2), rp.y+(height/2),
+ if (ret==1) fb_fragment_put_pixel_unchecked(fragment, rp.x+(width/2), rp.y+(height/2),
makergb(0xFF, 0xFF, 0xFF, (float)rp.opacity/OPACITY_MAX)
);
}
--
cgit v1.2.3