mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 11:55:59 +01:00
Add renderer pointer inside drm_surface
This commit is contained in:
parent
4101b89700
commit
eaef028976
3 changed files with 33 additions and 42 deletions
|
@ -175,7 +175,7 @@ void wlr_drm_resources_free(struct wlr_drm_backend *drm) {
|
||||||
|
|
||||||
static void wlr_drm_connector_make_current(struct wlr_output *output) {
|
static void wlr_drm_connector_make_current(struct wlr_output *output) {
|
||||||
struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
|
struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
|
||||||
wlr_drm_surface_make_current(&conn->drm->renderer, &conn->crtc->primary->surf);
|
wlr_drm_surface_make_current(&conn->crtc->primary->surf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void wlr_drm_connector_swap_buffers(struct wlr_output *output) {
|
static void wlr_drm_connector_swap_buffers(struct wlr_output *output) {
|
||||||
|
@ -185,7 +185,7 @@ static void wlr_drm_connector_swap_buffers(struct wlr_output *output) {
|
||||||
struct wlr_drm_crtc *crtc = conn->crtc;
|
struct wlr_drm_crtc *crtc = conn->crtc;
|
||||||
struct wlr_drm_plane *plane = crtc->primary;
|
struct wlr_drm_plane *plane = crtc->primary;
|
||||||
|
|
||||||
struct gbm_bo *bo = wlr_drm_surface_swap_buffers(&drm->renderer, &plane->surf);
|
struct gbm_bo *bo = wlr_drm_surface_swap_buffers(&plane->surf);
|
||||||
uint32_t fb_id = get_fb_for_bo(bo);
|
uint32_t fb_id = get_fb_for_bo(bo);
|
||||||
|
|
||||||
if (drm->iface->crtc_pageflip(drm, conn, crtc, fb_id, NULL)) {
|
if (drm->iface->crtc_pageflip(drm, conn, crtc, fb_id, NULL)) {
|
||||||
|
@ -217,7 +217,7 @@ void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn) {
|
||||||
struct wlr_drm_crtc *crtc = conn->crtc;
|
struct wlr_drm_crtc *crtc = conn->crtc;
|
||||||
struct wlr_drm_plane *plane = crtc->primary;
|
struct wlr_drm_plane *plane = crtc->primary;
|
||||||
|
|
||||||
struct gbm_bo *bo = wlr_drm_surface_get_front(&drm->renderer, &plane->surf);
|
struct gbm_bo *bo = wlr_drm_surface_get_front(&plane->surf);
|
||||||
uint32_t fb_id = get_fb_for_bo(bo);
|
uint32_t fb_id = get_fb_for_bo(bo);
|
||||||
|
|
||||||
struct wlr_drm_mode *mode = (struct wlr_drm_mode *)conn->output.current_mode;
|
struct wlr_drm_mode *mode = (struct wlr_drm_mode *)conn->output.current_mode;
|
||||||
|
@ -283,9 +283,9 @@ static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in)
|
||||||
|
|
||||||
if (*old != new) {
|
if (*old != new) {
|
||||||
if (*old) {
|
if (*old) {
|
||||||
wlr_drm_surface_finish(&drm->renderer, &(*old)->surf);
|
wlr_drm_surface_finish(&(*old)->surf);
|
||||||
}
|
}
|
||||||
wlr_drm_surface_finish(&drm->renderer, &new->surf);
|
wlr_drm_surface_finish(&new->surf);
|
||||||
*old = new;
|
*old = new;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -430,7 +430,7 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output,
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wlr_drm_surface_init(&drm->renderer, &crtc->primary->surf,
|
if (!wlr_drm_surface_init(&crtc->primary->surf, &drm->renderer,
|
||||||
mode->width, mode->height, GBM_FORMAT_XRGB8888,
|
mode->width, mode->height, GBM_FORMAT_XRGB8888,
|
||||||
GBM_BO_USE_SCANOUT)) {
|
GBM_BO_USE_SCANOUT)) {
|
||||||
wlr_log(L_ERROR, "Failed to initalise renderer for plane");
|
wlr_log(L_ERROR, "Failed to initalise renderer for plane");
|
||||||
|
@ -488,7 +488,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wlr_drm_surface_init(renderer, &plane->surf, w, h, GBM_FORMAT_ARGB8888, 0)) {
|
if (!wlr_drm_surface_init(&plane->surf, renderer, w, h, GBM_FORMAT_ARGB8888, 0)) {
|
||||||
wlr_log(L_ERROR, "Cannot allocate cursor resources");
|
wlr_log(L_ERROR, "Cannot allocate cursor resources");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -530,7 +530,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
wlr_drm_surface_make_current(renderer, &plane->surf);
|
wlr_drm_surface_make_current(&plane->surf);
|
||||||
|
|
||||||
wlr_texture_upload_pixels(plane->wlr_tex, WL_SHM_FORMAT_ARGB8888,
|
wlr_texture_upload_pixels(plane->wlr_tex, WL_SHM_FORMAT_ARGB8888,
|
||||||
stride, width, height, buf);
|
stride, width, height, buf);
|
||||||
|
@ -548,7 +548,7 @@ static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
|
||||||
glReadPixels(0, 0, plane->surf.width, plane->surf.height, GL_BGRA_EXT, GL_UNSIGNED_BYTE, 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);
|
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
|
||||||
|
|
||||||
wlr_drm_surface_swap_buffers(renderer, &plane->surf);
|
wlr_drm_surface_swap_buffers(&plane->surf);
|
||||||
|
|
||||||
gbm_bo_unmap(bo, bo_data);
|
gbm_bo_unmap(bo, bo_data);
|
||||||
|
|
||||||
|
@ -854,7 +854,7 @@ void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn) {
|
||||||
case WLR_DRM_CONN_CLEANUP:;
|
case WLR_DRM_CONN_CLEANUP:;
|
||||||
struct wlr_drm_crtc *crtc = conn->crtc;
|
struct wlr_drm_crtc *crtc = conn->crtc;
|
||||||
for (int i = 0; i < 3; ++i) {
|
for (int i = 0; i < 3; ++i) {
|
||||||
wlr_drm_surface_finish(&drm->renderer, &crtc->planes[i]->surf);
|
wlr_drm_surface_finish(&crtc->planes[i]->surf);
|
||||||
if (crtc->planes[i] && crtc->planes[i]->id == 0) {
|
if (crtc->planes[i] && crtc->planes[i]->id == 0) {
|
||||||
free(crtc->planes[i]);
|
free(crtc->planes[i]);
|
||||||
crtc->planes[i] = NULL;
|
crtc->planes[i] = NULL;
|
||||||
|
|
|
@ -35,13 +35,14 @@ void wlr_drm_renderer_finish(struct wlr_drm_renderer *renderer) {
|
||||||
gbm_device_destroy(renderer->gbm);
|
gbm_device_destroy(renderer->gbm);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wlr_drm_surface_init(struct wlr_drm_renderer *renderer,
|
bool wlr_drm_surface_init(struct wlr_drm_surface *surf,
|
||||||
struct wlr_drm_surface *surf, uint32_t width, uint32_t height,
|
struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height,
|
||||||
uint32_t format, uint32_t flags) {
|
uint32_t format, uint32_t flags) {
|
||||||
if (surf->width == width && surf->height == height) {
|
if (surf->width == width && surf->height == height) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
surf->renderer = renderer;
|
||||||
surf->width = width;
|
surf->width = width;
|
||||||
surf->height = height;
|
surf->height = height;
|
||||||
|
|
||||||
|
@ -67,13 +68,12 @@ error_zero:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_drm_surface_finish(struct wlr_drm_renderer *renderer,
|
void wlr_drm_surface_finish(struct wlr_drm_surface *surf) {
|
||||||
struct wlr_drm_surface *surf) {
|
if (!surf || !surf->renderer) {
|
||||||
if (!renderer || !surf || !surf->gbm) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
eglMakeCurrent(renderer->egl.display, EGL_NO_SURFACE, EGL_NO_SURFACE,
|
eglMakeCurrent(surf->renderer->egl.display, EGL_NO_SURFACE, EGL_NO_SURFACE,
|
||||||
EGL_NO_CONTEXT);
|
EGL_NO_CONTEXT);
|
||||||
|
|
||||||
if (surf->front) {
|
if (surf->front) {
|
||||||
|
@ -84,7 +84,7 @@ void wlr_drm_surface_finish(struct wlr_drm_renderer *renderer,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (surf->egl) {
|
if (surf->egl) {
|
||||||
eglDestroySurface(renderer->egl.display, surf->egl);
|
eglDestroySurface(surf->renderer->egl.display, surf->egl);
|
||||||
}
|
}
|
||||||
if (surf->gbm) {
|
if (surf->gbm) {
|
||||||
gbm_surface_destroy(surf->gbm);
|
gbm_surface_destroy(surf->gbm);
|
||||||
|
@ -93,34 +93,31 @@ void wlr_drm_surface_finish(struct wlr_drm_renderer *renderer,
|
||||||
memset(surf, 0, sizeof(*surf));
|
memset(surf, 0, sizeof(*surf));
|
||||||
}
|
}
|
||||||
|
|
||||||
void wlr_drm_surface_make_current(struct wlr_drm_renderer *renderer,
|
void wlr_drm_surface_make_current(struct wlr_drm_surface *surf) {
|
||||||
struct wlr_drm_surface *surf) {
|
eglMakeCurrent(surf->renderer->egl.display, surf->egl, surf->egl,
|
||||||
eglMakeCurrent(renderer->egl.display, surf->egl, surf->egl,
|
surf->renderer->egl.context);
|
||||||
renderer->egl.context);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_renderer *renderer,
|
struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_surface *surf) {
|
||||||
struct wlr_drm_surface *surf) {
|
|
||||||
if (surf->front) {
|
if (surf->front) {
|
||||||
gbm_surface_release_buffer(surf->gbm, surf->front);
|
gbm_surface_release_buffer(surf->gbm, surf->front);
|
||||||
}
|
}
|
||||||
|
|
||||||
eglSwapBuffers(renderer->egl.display, surf->egl);
|
eglSwapBuffers(surf->renderer->egl.display, surf->egl);
|
||||||
|
|
||||||
surf->front = surf->back;
|
surf->front = surf->back;
|
||||||
surf->back = gbm_surface_lock_front_buffer(surf->gbm);
|
surf->back = gbm_surface_lock_front_buffer(surf->gbm);
|
||||||
return surf->back;
|
return surf->back;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_renderer *renderer,
|
struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_surface *surf) {
|
||||||
struct wlr_drm_surface *surf) {
|
|
||||||
if (surf->front) {
|
if (surf->front) {
|
||||||
return surf->front;
|
return surf->front;
|
||||||
}
|
}
|
||||||
|
|
||||||
wlr_drm_surface_make_current(renderer, surf);
|
wlr_drm_surface_make_current(surf);
|
||||||
glViewport(0, 0, surf->width, surf->height);
|
glViewport(0, 0, surf->width, surf->height);
|
||||||
glClearColor(0.0, 0.0, 0.0, 1.0);
|
glClearColor(0.0, 0.0, 0.0, 1.0);
|
||||||
glClear(GL_COLOR_BUFFER_BIT);
|
glClear(GL_COLOR_BUFFER_BIT);
|
||||||
return wlr_drm_surface_swap_buffers(renderer, surf);
|
return wlr_drm_surface_swap_buffers(surf);
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,8 @@ struct wlr_drm_renderer {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wlr_drm_surface {
|
struct wlr_drm_surface {
|
||||||
|
struct wlr_drm_renderer *renderer;
|
||||||
|
|
||||||
uint32_t width;
|
uint32_t width;
|
||||||
uint32_t height;
|
uint32_t height;
|
||||||
|
|
||||||
|
@ -25,23 +27,15 @@ struct wlr_drm_surface {
|
||||||
};
|
};
|
||||||
|
|
||||||
bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd);
|
bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd);
|
||||||
|
|
||||||
void wlr_drm_renderer_finish(struct wlr_drm_renderer *renderer);
|
void wlr_drm_renderer_finish(struct wlr_drm_renderer *renderer);
|
||||||
|
|
||||||
bool wlr_drm_surface_init(struct wlr_drm_renderer *renderer,
|
bool wlr_drm_surface_init(struct wlr_drm_surface *surf,
|
||||||
struct wlr_drm_surface *surf, uint32_t width, uint32_t height,
|
struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height,
|
||||||
uint32_t format, uint32_t flags);
|
uint32_t format, uint32_t flags);
|
||||||
|
|
||||||
void wlr_drm_surface_finish(struct wlr_drm_renderer *renderer,
|
void wlr_drm_surface_finish(struct wlr_drm_surface *surf);
|
||||||
struct wlr_drm_surface *surf);
|
void wlr_drm_surface_make_current(struct wlr_drm_surface *surf);
|
||||||
|
struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_surface *surf);
|
||||||
void wlr_drm_surface_make_current(struct wlr_drm_renderer *renderer,
|
struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_surface *surf);
|
||||||
struct wlr_drm_surface *surf);
|
|
||||||
|
|
||||||
struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_renderer *renderer,
|
|
||||||
struct wlr_drm_surface *surf);
|
|
||||||
|
|
||||||
struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_renderer *renderer,
|
|
||||||
struct wlr_drm_surface *surf);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue