sean-m
/
nuklear
mirror of https://github.com/vurtun/nuklear.git
1
0
Fork 0
Code Issues Releases Activity

nuklear_rawfb: Use pitch in offset calculation 

Use the framebuffer pitch to calculate the correct offset.
Fixes garbled rendering on framebuffer that have
pitch != x_resolution * bpp / 8.

The demo application is unaffected as the pitch always aligns with
the x resolution of the window.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
pull/623/head
Patrick Rudolph 2018-02-04 17:08:17 +01:00
parent 2e767417b3
commit 66946dc3cf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demo/x11_rawfb/nuklear_rawfb.h
View File

@ -90,9 +90,11 @@ nk_rawfb_setpixel(const struct rawfb_context *rawfb,
const short x0, const short y0, const struct nk_color col)
{
unsigned int c = nk_color_from_byte(&col.r);
unsigned int *ptr = (unsigned int *)rawfb->fb.pixels;
unsigned char *pixels = rawfb->fb.pixels;
unsigned int *ptr;
ptr += y0 * rawfb->fb.w;
pixels += y0 * rawfb->fb.pitch;
ptr = (unsigned int *)pixels;
ptr += x0;
if (y0 < rawfb->scissors.h && y0 >= rawfb->scissors.y &&
@ -109,8 +111,11 @@ nk_rawfb_line_horizontal(const struct rawfb_context *rawfb,
* The caller has to make sure it does no exceed bounds. */
unsigned int i, n;
unsigned int c[16];
unsigned int *ptr = (unsigned int *)rawfb->fb.pixels;
ptr += y * rawfb->fb.w;
unsigned char *pixels = rawfb->fb.pixels;
unsigned int *ptr;
pixels += y * rawfb->fb.pitch;
ptr = (unsigned int *)pixels;
ptr += x0;
n = x1 - x0;