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

Remove unnecesary wlr_renderers

This commit is contained in:
Scott Anderson 2017-10-21 17:35:37 +13:00
parent 9b984253e2
commit 4ea84c5765
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/drm/drm.c
View File

@ -177,9 +177,6 @@ void wlr_drm_resources_free(struct wlr_drm_backend *drm) {
if (plane->wlr_tex) { if (plane->wlr_tex) {
wlr_texture_destroy(plane->wlr_tex); wlr_texture_destroy(plane->wlr_tex);
} }
if (plane->wlr_rend) {
wlr_renderer_destroy(plane->wlr_rend);
}
} }
free(drm->crtcs); free(drm->crtcs);
@ -525,12 +522,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
// TODO the image needs to be rotated depending on the output rotation // TODO the image needs to be rotated depending on the output rotation
plane->wlr_rend = wlr_gles2_renderer_create(&drm->backend); plane->wlr_tex = wlr_render_texture_create(plane->surf.renderer->wlr_rend);
if (!plane->wlr_rend) {
return false;
}
plane->wlr_tex = wlr_render_texture_create(plane->wlr_rend);
if (!plane->wlr_tex) { if (!plane->wlr_tex) {
return false; return false;
} }
@ -595,7 +587,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
float matrix[16]; float matrix[16];
wlr_texture_get_matrix(plane->wlr_tex, &matrix, &plane->matrix, 0, 0); wlr_texture_get_matrix(plane->wlr_tex, &matrix, &plane->matrix, 0, 0);
wlr_render_with_matrix(plane->wlr_rend, plane->wlr_tex, &matrix); wlr_render_with_matrix(plane->surf.renderer->wlr_rend, plane->wlr_tex, &matrix);
glFinish(); glFinish();
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, bo_stride); glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, bo_stride);

1
include/backend/drm/drm.h
View File

@ -30,7 +30,6 @@ struct wlr_drm_plane {
// Only used by cursor // Only used by cursor
float matrix[16]; float matrix[16];
struct wlr_renderer *wlr_rend;
struct wlr_texture *wlr_tex; struct wlr_texture *wlr_tex;
struct gbm_bo *cursor_bo; struct gbm_bo *cursor_bo;