diff options
| author | Simon Ser <contact@emersion.fr> | 2021-02-16 19:20:00 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-02-23 16:09:26 +0100 |
| commit | ddfee63055d53b975039e768cdb5ee3ea92ab5ab (patch) | |
| tree | 0679d0b6a24a411437b58dbc2250c46483f5b7af /render/gles2 | |
| parent | 549435aee52164b925716283ce38597de85bc2bf (diff) | |
render: use DRM formats in wlr_renderer_get_shm_texture_formats
Diffstat (limited to 'render/gles2')
| -rw-r--r-- | render/gles2/pixel_format.c | 9 | ||||
| -rw-r--r-- | render/gles2/renderer.c | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/render/gles2/pixel_format.c b/render/gles2/pixel_format.c index d7711caa..4ca98fe9 100644 --- a/render/gles2/pixel_format.c +++ b/render/gles2/pixel_format.c @@ -2,7 +2,6 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> #include "render/gles2.h" -#include "render/shm_format.h" /* * The DRM formats are little endian while the GL formats are big endian, @@ -66,11 +65,11 @@ const struct wlr_gles2_pixel_format *get_gles2_format_from_gl( return NULL; } -const enum wl_shm_format *get_gles2_wl_formats(size_t *len) { - static enum wl_shm_format wl_formats[sizeof(formats) / sizeof(formats[0])]; +const uint32_t *get_gles2_shm_formats(size_t *len) { + static uint32_t shm_formats[sizeof(formats) / sizeof(formats[0])]; *len = sizeof(formats) / sizeof(formats[0]); for (size_t i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) { - wl_formats[i] = convert_drm_format_to_wl_shm(formats[i].drm_format); + shm_formats[i] = formats[i].drm_format; } - return wl_formats; + return shm_formats; } diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index fa7bc6c7..d6dc8dbc 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -389,9 +389,9 @@ static void gles2_render_ellipse_with_matrix(struct wlr_renderer *wlr_renderer, pop_gles2_debug(renderer); } -static const enum wl_shm_format *gles2_get_shm_texture_formats( +static const uint32_t *gles2_get_shm_texture_formats( struct wlr_renderer *wlr_renderer, size_t *len) { - return get_gles2_wl_formats(len); + return get_gles2_shm_formats(len); } static bool gles2_resource_is_wl_drm_buffer(struct wlr_renderer *wlr_renderer, |