From 58dc1b28d1ef4d1931c52b079d304f2e1546329d Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Wed, 11 Jan 2012 14:23:24 -0500 Subject: wayland-drm: Drop the non-premul formats, use format codes from drm_fourcc.h --- src/egl/drivers/dri2/egl_dri2.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/egl/drivers/dri2/egl_dri2.c') diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 5fff7e1ccef..80b2e38d9d3 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1094,11 +1094,10 @@ dri2_create_image_wayland_wl_buffer(_EGLDisplay *disp, _EGLContext *ctx, attrs.Height = buffer->height; switch (wayland_drm_buffer_get_format(buffer)) { - case WL_DRM_FORMAT_ARGB32: - case WL_DRM_FORMAT_PREMULTIPLIED_ARGB32: + case WL_DRM_FORMAT_ARGB8888: format = __DRI_IMAGE_FORMAT_ARGB8888; break; - case WL_DRM_FORMAT_XRGB32: + case WL_DRM_FORMAT_XRGB8888: format = __DRI_IMAGE_FORMAT_XRGB8888; break; default: @@ -1273,11 +1272,10 @@ dri2_wl_reference_buffer(void *user_data, uint32_t name, int dri_format; switch (format) { - case WL_DRM_FORMAT_ARGB32: - case WL_DRM_FORMAT_PREMULTIPLIED_ARGB32: + case WL_DRM_FORMAT_ARGB8888: dri_format =__DRI_IMAGE_FORMAT_ARGB8888; break; - case WL_DRM_FORMAT_XRGB32: + case WL_DRM_FORMAT_XRGB8888: dri_format = __DRI_IMAGE_FORMAT_XRGB8888; break; default: -- cgit v1.2.3