blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/drm: remove remaining raw GL call 

This makes the hardware cursor code a less efficient. Can be
fixed with a GLES3 renderer.
This commit is contained in:
emersion 2018-03-21 11:34:08 +01:00
parent 8207f0f081
commit 60bfe0a6aa
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/drm/drm.c
View File

@ -582,11 +582,8 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
return false; return false;
} }
// OpenGL will read the pixels out upside down, enum wl_output_transform transform =
// so we need to flip the image vertically wlr_output_transform_invert(output->transform);
enum wl_output_transform transform = wlr_output_transform_compose(
wlr_output_transform_invert(output->transform),
WL_OUTPUT_TRANSFORM_FLIPPED_180);
wlr_matrix_projection(plane->matrix, plane->surf.width, wlr_matrix_projection(plane->matrix, plane->surf.width,
plane->surf.height, transform); plane->surf.height, transform);
@ -649,11 +646,8 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
wlr_render_texture(rend, plane->wlr_tex, plane->matrix, 0, 0, 1.0f); wlr_render_texture(rend, plane->wlr_tex, plane->matrix, 0, 0, 1.0f);
wlr_renderer_end(rend); wlr_renderer_end(rend);
// TODO: remove these raw GL calls wlr_renderer_read_pixels(rend, WL_SHM_FORMAT_ARGB8888, bo_stride,
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, bo_stride); plane->surf.width, plane->surf.height, 0, 0, 0, 0, bo_data);
glReadPixels(0, 0, plane->surf.width, plane->surf.height, GL_BGRA_EXT,
GL_UNSIGNED_BYTE, bo_data);
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
wlr_drm_surface_swap_buffers(&plane->surf, NULL); wlr_drm_surface_swap_buffers(&plane->surf, NULL);