diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2021-03-24 10:10:52 -0400 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-03-25 10:55:54 +0100 |
| commit | 78d21fa131d746a7ae5890657654161692da63b6 (patch) | |
| tree | 88d5ff5c5fbe868a331a309d9acc2b3955000251 /render/gles2/renderer.c | |
| parent | 9b3f2e327f1dae047e9c5d778068a22275e8a6f8 (diff) | |
render/gles2: remove depth and bpp gles2_pixel_format, use drm pixel format
Diffstat (limited to 'render/gles2/renderer.c')
| -rw-r--r-- | render/gles2/renderer.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 504af574..eb93b3b4 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -15,6 +15,7 @@ #include <wlr/types/wlr_linux_dmabuf_v1.h> #include <wlr/util/log.h> #include "render/gles2.h" +#include "render/pixel_format.h" static const GLfloat verts[] = { 1, 0, // top right @@ -492,6 +493,10 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer, return false; } + const struct wlr_pixel_format_info *drm_fmt = + drm_get_pixel_format_info(fmt->drm_format); + assert(drm_fmt); + push_gles2_debug(renderer); // Make sure any pending drawing is finished before we try to read it @@ -500,7 +505,7 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer, glGetError(); // Clear the error flag unsigned char *p = (unsigned char *)data + dst_y * stride; - uint32_t pack_stride = width * fmt->bpp / 8; + uint32_t pack_stride = width * drm_fmt->bpp / 8; if (pack_stride == stride && dst_x == 0) { // Under these particular conditions, we can read the pixels with only // one glReadPixels call @@ -512,7 +517,7 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer, for (size_t i = 0; i < height; ++i) { uint32_t y = src_y + i; glReadPixels(src_x, y, width, 1, fmt->gl_format, - fmt->gl_type, p + i * stride + dst_x * fmt->bpp / 8); + fmt->gl_type, p + i * stride + dst_x * drm_fmt->bpp / 8); } } |