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

Revert "st/dri: add 32-bit RGBX/RGBA formats"

Browse source 
This reverts commit ccdcf91104.

It breaks most KDE apps, because DRI doesn't support the RGBA component
ordering.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95071
This commit is contained in:
Marek Olšák 2016-04-24 15:13:28 +02:00
parent 147a2d25ad
commit c0c6ca40a2
2 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/state_trackers/dri/dri2.c
View file

@ -120,9 +120,6 @@ static enum pipe_format dri2_format_to_pipe_format (int format)
case __DRI_IMAGE_FORMAT_ARGB8888: case __DRI_IMAGE_FORMAT_ARGB8888:
pf = PIPE_FORMAT_BGRA8888_UNORM; pf = PIPE_FORMAT_BGRA8888_UNORM;
break; break;
case __DRI_IMAGE_FORMAT_XBGR8888:
pf = PIPE_FORMAT_RGBX8888_UNORM;
break;
case __DRI_IMAGE_FORMAT_ABGR8888: case __DRI_IMAGE_FORMAT_ABGR8888:
pf = PIPE_FORMAT_RGBA8888_UNORM; pf = PIPE_FORMAT_RGBA8888_UNORM;
break; break;
@ -300,9 +297,6 @@ dri_image_drawable_get_buffers(struct dri_drawable *drawable,
case PIPE_FORMAT_BGRA8888_UNORM: case PIPE_FORMAT_BGRA8888_UNORM:
image_format = __DRI_IMAGE_FORMAT_ARGB8888; image_format = __DRI_IMAGE_FORMAT_ARGB8888;
break; break;
case PIPE_FORMAT_RGBX8888_UNORM:
image_format = __DRI_IMAGE_FORMAT_XBGR8888;
break;
case PIPE_FORMAT_RGBA8888_UNORM: case PIPE_FORMAT_RGBA8888_UNORM:
image_format = __DRI_IMAGE_FORMAT_ABGR8888; image_format = __DRI_IMAGE_FORMAT_ABGR8888;
break; break;

4
src/gallium/state_trackers/dri/dri_screen.c
View file

@ -104,8 +104,6 @@ static const __DRIconfig **
dri_fill_in_modes(struct dri_screen *screen) dri_fill_in_modes(struct dri_screen *screen)
{ {
static const mesa_format mesa_formats[] = { static const mesa_format mesa_formats[] = {
MESA_FORMAT_R8G8B8A8_UNORM,
MESA_FORMAT_R8G8B8X8_UNORM,
MESA_FORMAT_B8G8R8A8_UNORM, MESA_FORMAT_B8G8R8A8_UNORM,
MESA_FORMAT_B8G8R8X8_UNORM, MESA_FORMAT_B8G8R8X8_UNORM,
MESA_FORMAT_B8G8R8A8_SRGB, MESA_FORMAT_B8G8R8A8_SRGB,
@ -113,8 +111,6 @@ dri_fill_in_modes(struct dri_screen *screen)
MESA_FORMAT_B5G6R5_UNORM, MESA_FORMAT_B5G6R5_UNORM,
}; };
static const enum pipe_format pipe_formats[] = { static const enum pipe_format pipe_formats[] = {
PIPE_FORMAT_RGBA8888_UNORM,
PIPE_FORMAT_RGBX8888_UNORM,
PIPE_FORMAT_BGRA8888_UNORM, PIPE_FORMAT_BGRA8888_UNORM,
PIPE_FORMAT_BGRX8888_UNORM, PIPE_FORMAT_BGRX8888_UNORM,
PIPE_FORMAT_BGRA8888_SRGB, PIPE_FORMAT_BGRA8888_SRGB,