diff options
Diffstat (limited to 'src/user/lib/draw')
-rw-r--r-- | src/user/lib/draw/draw.c | 2 | ||||
-rw-r--r-- | src/user/lib/draw/draw.h | 24 | ||||
-rw-r--r-- | src/user/lib/draw/flush.c | 2 |
3 files changed, 2 insertions, 26 deletions
diff --git a/src/user/lib/draw/draw.c b/src/user/lib/draw/draw.c index 3fb6a99..1c2a371 100644 --- a/src/user/lib/draw/draw.c +++ b/src/user/lib/draw/draw.c @@ -4,7 +4,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <user/lib/draw/draw.h> +#include <draw.h> void dirty_reset(struct rect *d) { d->x1 = ~0; d->y1 = ~0; diff --git a/src/user/lib/draw/draw.h b/src/user/lib/draw/draw.h deleted file mode 100644 index 5e614be..0000000 --- a/src/user/lib/draw/draw.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once -#include <camellia/types.h> -#include <stddef.h> -#include <stdint.h> - -struct framebuf { - size_t len, width, height, pitch; - uint8_t bpp; - char *b; - - hid_t fd; -}; - -struct rect { uint32_t x1, y1, x2, y2; }; -void dirty_reset(struct rect *d); -void dirty_mark(struct rect *d, uint32_t x, uint32_t y); -void dirty_flush(struct rect *d, struct framebuf *fb); - -int fb_setup(struct framebuf *fb, const char *base); -int fb_anon(struct framebuf *fb, size_t w, size_t h); -uint32_t *fb_pixel(struct framebuf *fb, uint32_t x, uint32_t y); -void fb_cpy( - struct framebuf *dest, const struct framebuf *src, - size_t xd, size_t yd, size_t xs, size_t ys, size_t w, size_t h); diff --git a/src/user/lib/draw/flush.c b/src/user/lib/draw/flush.c index 3b4a978..88bf3d6 100644 --- a/src/user/lib/draw/flush.c +++ b/src/user/lib/draw/flush.c @@ -1,6 +1,6 @@ #include <camellia/execbuf.h> #include <camellia/syscalls.h> -#include <user/lib/draw/draw.h> +#include <draw.h> static void flush_combined(struct rect pix, struct framebuf *fb) { size_t low = fb->pitch * pix.y1 + 4 * pix.x1; |