fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 19:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "st/egl: correctly return configs under wayland"

Browse source 
This reverts commit 95b445699d.
This commit is contained in:
Chia-I Wu 2011-09-08 16:05:32 +08:00
parent 93a96abe16
commit ee0e6ae2bb
4 changed files with 30 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/gallium/state_trackers/egl/wayland/native_drm.c
View file

@ -58,11 +58,6 @@ struct wayland_drm_display {
int fd;
char *device_name;
boolean authenticated;
/* supported formats */
boolean argb32;
boolean argb32_pre;
boolean xrgb32;
};
static INLINE struct wayland_drm_display *
@ -82,8 +77,8 @@ wayland_drm_display_destroy(struct native_display *ndpy)
wl_drm_destroy(drmdpy->wl_drm);
if (drmdpy->device_name)
FREE(drmdpy->device_name);
if (drmdpy->base.configs)
FREE(drmdpy->base.configs);
if (drmdpy->base.config)
FREE(drmdpy->base.config);
if (drmdpy->base.own_dpy)
wl_display_destroy(drmdpy->base.dpy);
@ -129,50 +124,6 @@ wayland_create_drm_buffer(struct wayland_display *display,
width, height, wsh.stride, format);
}
static boolean
wayland_drm_display_add_configs(struct wayland_drm_display *drmdpy)
{
struct wayland_config *configs;
enum pipe_format formats[2];
int i, num_formats = 0;
/*
* Only argb32 counts here. If we make (!argbb32 && argb32_pre) count, we
* will not be able to support the case where
* native_present_control::premultiplied_alpha is FALSE.
*/
if (drmdpy->argb32)
formats[num_formats++] = PIPE_FORMAT_B8G8R8A8_UNORM;
if (drmdpy->xrgb32)
formats[num_formats++] = PIPE_FORMAT_B8G8R8X8_UNORM;
if (!num_formats)
return FALSE;
configs = CALLOC(num_formats, sizeof(*configs));
if (!configs)
return FALSE;
for (i = 0; i < num_formats; i++) {
struct native_config *nconf = &configs[i].base;
nconf->buffer_mask =
(1 << NATIVE_ATTACHMENT_FRONT_LEFT) |
(1 << NATIVE_ATTACHMENT_BACK_LEFT);
nconf->color_format = formats[i];
nconf->window_bit = TRUE;
nconf->pixmap_bit = TRUE;
}
drmdpy->base.configs = configs;
drmdpy->base.num_configs = num_formats;
return TRUE;
}
static void
drm_handle_device(void *data, struct wl_drm *drm, const char *device)
{
@ -197,19 +148,7 @@ drm_handle_device(void *data, struct wl_drm *drm, const char *device)
static void
drm_handle_format(void *data, struct wl_drm *drm, uint32_t format)
{
struct wayland_drm_display *drmdpy = data;
switch (format) {
case WL_DRM_FORMAT_ARGB32:
drmdpy->argb32 = TRUE;
break;
case WL_DRM_FORMAT_PREMULTIPLIED_ARGB32:
drmdpy->argb32_pre = TRUE;
break;
case WL_DRM_FORMAT_XRGB32:
drmdpy->xrgb32 = TRUE;
break;
}
/* TODO */
}
static void
@ -252,9 +191,6 @@ wayland_drm_display_init_screen(struct native_display *ndpy)
if (!drmdpy->authenticated)
return FALSE;
if (!wayland_drm_display_add_configs(drmdpy))
return FALSE;
drmdpy->base.base.screen =
drmdpy->event_handler->new_drm_screen(&drmdpy->base.base,
NULL, drmdpy->fd);

41
src/gallium/state_trackers/egl/wayland/native_shm.c
View file

@ -63,8 +63,8 @@ wayland_shm_display_destroy(struct native_display *ndpy)
{
struct wayland_shm_display *shmdpy = wayland_shm_display(ndpy);
if (shmdpy->base.configs)
FREE(shmdpy->base.configs);
if (shmdpy->base.config)
FREE(shmdpy->base.config);
if (shmdpy->base.own_dpy)
wl_display_destroy(shmdpy->base.dpy);
@ -110,40 +110,6 @@ wayland_create_shm_buffer(struct wayland_display *display,
wsh.stride, format);
}
static boolean
wayland_shm_display_add_configs(struct wayland_shm_display *shmdpy)
{
struct wayland_config *configs;
enum pipe_format formats[2];
int i, num_formats = 0;
/* assume all formats are supported */
formats[num_formats++] = PIPE_FORMAT_B8G8R8A8_UNORM;
formats[num_formats++] = PIPE_FORMAT_B8G8R8X8_UNORM;
configs = CALLOC(num_formats, sizeof(*configs));
if (!configs)
return FALSE;
for (i = 0; i < num_formats; i++) {
struct native_config *nconf = &configs[i].base;
nconf->buffer_mask =
(1 << NATIVE_ATTACHMENT_FRONT_LEFT) |
(1 << NATIVE_ATTACHMENT_BACK_LEFT);
nconf->color_format = formats[i];
nconf->window_bit = TRUE;
nconf->pixmap_bit = TRUE;
}
shmdpy->base.configs = configs;
shmdpy->base.num_configs = num_formats;
return TRUE;
}
static boolean
wayland_shm_display_init_screen(struct native_display *ndpy)
{
@ -162,9 +128,6 @@ wayland_shm_display_init_screen(struct native_display *ndpy)
if (!shmdpy->wl_shm)
return FALSE;
if (!wayland_shm_display_add_configs(shmdpy))
return FALSE;
winsys = wayland_create_sw_winsys(shmdpy->base.dpy);
if (!winsys)
return FALSE;

28
src/gallium/state_trackers/egl/wayland/native_wayland.c
View file

@ -44,11 +44,31 @@ wayland_display_get_configs (struct native_display *ndpy, int *num_configs)
const struct native_config **configs;
int i;
configs = MALLOC(display->num_configs * sizeof(*configs));
if (configs) {
for (i = 0; i < display->num_configs; i++) {
configs[i] = &display->configs[i].base;
if (!display->config) {
struct native_config *nconf;
display->config = CALLOC(2, sizeof(*display->config));
if (!display->config)
return NULL;
for (i = 0; i < 2; ++i) {
nconf = &display->config[i].base;
nconf->buffer_mask =
(1 << NATIVE_ATTACHMENT_FRONT_LEFT) |
(1 << NATIVE_ATTACHMENT_BACK_LEFT);
nconf->window_bit = TRUE;
nconf->pixmap_bit = TRUE;
}
display->config[0].base.color_format = PIPE_FORMAT_B8G8R8A8_UNORM;
display->config[1].base.color_format = PIPE_FORMAT_B8G8R8X8_UNORM;
}
configs = MALLOC(2 * sizeof(*configs));
if (configs) {
configs[0] = &display->config[0].base;
configs[1] = &display->config[1].base;
if (num_configs)
*num_configs = 2;
}

4
src/gallium/state_trackers/egl/wayland/native_wayland.h
View file

@ -39,12 +39,10 @@ struct wayland_surface;
struct wayland_display {
struct native_display base;
struct wayland_config *config;
struct wl_display *dpy;
boolean own_dpy;
struct wayland_config *configs;
int num_configs;
struct wl_buffer *(*create_buffer)(struct wayland_display *display,
struct wayland_surface *surface,
enum native_attachment attachment);