RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pixman-renderer: Use negative stride for y-inversion

pull/55/head
Andri Yngvason 2020-06-21 14:25:23 +00:00
parent 1cafc25655
commit 12555bea13
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/pixman-renderer.c
View File

@ -9,29 +9,33 @@
void wv_pixman_render(struct nvnc_fb* dst, const struct wv_buffer* src, void wv_pixman_render(struct nvnc_fb* dst, const struct wv_buffer* src,
enum wl_output_transform transform, enum wl_output_transform transform,
struct pixman_region16* damage) { struct pixman_region16* damage)
uint32_t* addr = nvnc_fb_get_addr(dst); {
uint32_t width = nvnc_fb_get_width(dst); uint32_t* dst_pixels = nvnc_fb_get_addr(dst);
uint32_t height = nvnc_fb_get_height(dst); uint32_t dst_width = nvnc_fb_get_width(dst);
uint32_t dst_height = nvnc_fb_get_height(dst);
// TODO: Check that both buffers have the same dimensions // TODO: Check that both buffers have the same dimensions after applying
// transform
pixman_image_t* dstimg = pixman_image_create_bits_no_clear( pixman_image_t* dstimg = pixman_image_create_bits_no_clear(
PIXMAN_x8b8g8r8, width, height, addr, 4 * width); PIXMAN_x8b8g8r8, dst_width, dst_height, dst_pixels,
4 * dst_width);
intptr_t src_offset = src->y_inverted ?
src->stride * (src->height - 1) : 0;
void* src_pixels = (void*)((intptr_t)src->pixels + src_offset);
int src_stride = src->y_inverted ? -src->stride : src->stride;
pixman_format_code_t src_fmt = 0; pixman_format_code_t src_fmt = 0;
fourcc_to_pixman_fmt(&src_fmt, src->format); fourcc_to_pixman_fmt(&src_fmt, src->format);
pixman_image_t* srcimg = pixman_image_create_bits_no_clear( pixman_image_t* srcimg = pixman_image_create_bits_no_clear(
src_fmt, width, height, src->pixels, src->stride); src_fmt, src->width, src->height, src_pixels,
src_stride);
if (src->y_inverted)
transform = wv_output_transform_compose(
WL_OUTPUT_TRANSFORM_FLIPPED_180, transform);
pixman_transform_t pxform; pixman_transform_t pxform;
wv_pixman_transform_from_wl_output_transform(&pxform, transform, width, wv_pixman_transform_from_wl_output_transform(&pxform, transform,
height); src->width, src->height);
pixman_image_set_transform(srcimg, &pxform); pixman_image_set_transform(srcimg, &pxform);
pixman_image_set_clip_region(dstimg, damage); pixman_image_set_clip_region(dstimg, damage);
@ -40,7 +44,7 @@ void wv_pixman_render(struct nvnc_fb* dst, const struct wv_buffer* src,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
width, height); dst_width, dst_height);
pixman_image_unref(srcimg); pixman_image_unref(srcimg);
pixman_image_unref(dstimg); pixman_image_unref(dstimg);