fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 08:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl/wayland: Use pipe_format to look up configs

Browse source 
Instead of using the sizes and shifts to look up a dri2_wl_visual from a
config, just use the pipe_format we stash in the config.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27709>
This commit is contained in:
Daniel Stone 2023-08-08 15:52:24 +01:00 • committed by Marge Bot
parent 9ea9a963aa
commit 6a084e2b08
1 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/egl/drivers/dri2/platform_wayland.c
View file

@ -44,6 +44,7 @@
#include "util/anon_file.h"
#include "util/u_vector.h"
#include "util/format/u_formats.h"
#include "main/glconfig.h"
#include "egl_dri2.h"
#include "eglglobals.h"
#include "kopper_interface.h"
@ -246,29 +247,25 @@ static const struct dri2_wl_visual {
};
static int
dri2_wl_visual_idx_from_config(struct dri2_egl_display *dri2_dpy,
const __DRIconfig *config)
dri2_wl_visual_idx_from_pipe_format(enum pipe_format pipe_format)
{
int shifts[4];
unsigned int sizes[4];
dri2_get_shifts_and_sizes(dri2_dpy->core, config, shifts, sizes);
for (unsigned int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
const struct dri2_wl_visual *wl_visual = &dri2_wl_visuals[i];
int cmp_rgba_shifts =
memcmp(shifts, wl_visual->rgba_shifts, 4 * sizeof(shifts[0]));
int cmp_rgba_sizes =
memcmp(sizes, wl_visual->rgba_sizes, 4 * sizeof(sizes[0]));
if (cmp_rgba_shifts == 0 && cmp_rgba_sizes == 0)
for (int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
if (dri2_wl_visuals[i].pipe_format == pipe_format)
return i;
}
return -1;
}
static int
dri2_wl_visual_idx_from_config(struct dri2_egl_display *dri2_dpy,
const __DRIconfig *config)
{
struct gl_config *gl_config = (struct gl_config *) config;
return dri2_wl_visual_idx_from_pipe_format(gl_config->color_format);
}
static int
dri2_wl_visual_idx_from_fourcc(uint32_t fourcc)
{
@ -282,17 +279,6 @@ dri2_wl_visual_idx_from_fourcc(uint32_t fourcc)
return -1;
}
static int
dri2_wl_visual_idx_from_pipe_format(enum pipe_format pipe_format)
{
for (int i = 0; i < ARRAY_SIZE(dri2_wl_visuals); i++) {
if (dri2_wl_visuals[i].pipe_format == pipe_format)
return i;
}
return -1;
}
static int
dri2_wl_visual_idx_from_shm_format(uint32_t shm_format)
{