mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gl-renderer: use pixel_format_info in read_pixels

Browse Source 
The GL format and type are already recorded with pixel_format_info, use
that instead of a switch on Pixman formats.

Less special-casing, less dependency on Pixman formats.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2022-08-01 16:02:09 +03:00
committed by Marius Vlad
parent b966fd07ea
commit 851b16f00c
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/renderer-gl/gl-renderer.c
+3 -12
View File
@@ -1752,29 +1752,20 @@ gl_renderer_read_pixels(struct weston_output *output,
uint32_t x, uint32_t y, uint32_t x, uint32_t y,
uint32_t width, uint32_t height) uint32_t width, uint32_t height)
{ {
GLenum gl_format;
struct gl_output_state *go = get_output_state(output); struct gl_output_state *go = get_output_state(output);
x += go->borders[GL_RENDERER_BORDER_LEFT].width; x += go->borders[GL_RENDERER_BORDER_LEFT].width;
y += go->borders[GL_RENDERER_BORDER_BOTTOM].height; y += go->borders[GL_RENDERER_BORDER_BOTTOM].height;
switch (format->pixman_format) { if (format->gl_format == 0 || format->gl_type == 0)
case PIXMAN_a8r8g8b8:
gl_format = GL_BGRA_EXT;
break;
case PIXMAN_a8b8g8r8:
gl_format = GL_RGBA;
break;
default:
return -1; return -1;
}
if (use_output(output) < 0) if (use_output(output) < 0)
return -1; return -1;
glPixelStorei(GL_PACK_ALIGNMENT, 1); glPixelStorei(GL_PACK_ALIGNMENT, 1);
glReadPixels(x, y, width, height, gl_format, glReadPixels(x, y, width, height, format->gl_format,
GL_UNSIGNED_BYTE, pixels); format->gl_type, pixels);
return 0; return 0;
} }