render: use DRM formats in wlr_renderer_get_shm_texture_formats

This commit is contained in:
Simon Ser 2021-02-16 19:20:00 +01:00
parent 549435aee5
commit ddfee63055
6 changed files with 17 additions and 17 deletions

View file

@ -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;
}

View file

@ -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,