diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-04-24 15:13:28 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-04-24 15:16:07 +0200 |
| commit | c0c6ca40a25e47068984155521db8b4aa3e7569c (patch) | |
| tree | 4125efc7c92c2d79d622c597821c72d4b0992f65 /src/gallium/state_trackers/dri | |
| parent | 147a2d25adcfc3af96d3a7182ce6d367fffb9522 (diff) | |
| download | external_mesa3d-c0c6ca40a25e47068984155521db8b4aa3e7569c.zip external_mesa3d-c0c6ca40a25e47068984155521db8b4aa3e7569c.tar.gz external_mesa3d-c0c6ca40a25e47068984155521db8b4aa3e7569c.tar.bz2 | |
Revert "st/dri: add 32-bit RGBX/RGBA formats"
This reverts commit ccdcf91104a5f07127b5b8d8570b5c4bbcf86647.
It breaks most KDE apps, because DRI doesn't support the RGBA component
ordering.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95071
Diffstat (limited to 'src/gallium/state_trackers/dri')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri2.c | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.c | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index 9d948a2..675a9bb 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -120,9 +120,6 @@ static enum pipe_format dri2_format_to_pipe_format (int format) case __DRI_IMAGE_FORMAT_ARGB8888: pf = PIPE_FORMAT_BGRA8888_UNORM; break; - case __DRI_IMAGE_FORMAT_XBGR8888: - pf = PIPE_FORMAT_RGBX8888_UNORM; - break; case __DRI_IMAGE_FORMAT_ABGR8888: pf = PIPE_FORMAT_RGBA8888_UNORM; break; @@ -300,9 +297,6 @@ dri_image_drawable_get_buffers(struct dri_drawable *drawable, case PIPE_FORMAT_BGRA8888_UNORM: image_format = __DRI_IMAGE_FORMAT_ARGB8888; break; - case PIPE_FORMAT_RGBX8888_UNORM: - image_format = __DRI_IMAGE_FORMAT_XBGR8888; - break; case PIPE_FORMAT_RGBA8888_UNORM: image_format = __DRI_IMAGE_FORMAT_ABGR8888; break; diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index 2856ec0..2ac55c8 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -104,8 +104,6 @@ static const __DRIconfig ** dri_fill_in_modes(struct dri_screen *screen) { static const mesa_format mesa_formats[] = { - MESA_FORMAT_R8G8B8A8_UNORM, - MESA_FORMAT_R8G8B8X8_UNORM, MESA_FORMAT_B8G8R8A8_UNORM, MESA_FORMAT_B8G8R8X8_UNORM, MESA_FORMAT_B8G8R8A8_SRGB, @@ -113,8 +111,6 @@ dri_fill_in_modes(struct dri_screen *screen) MESA_FORMAT_B5G6R5_UNORM, }; static const enum pipe_format pipe_formats[] = { - PIPE_FORMAT_RGBA8888_UNORM, - PIPE_FORMAT_RGBX8888_UNORM, PIPE_FORMAT_BGRA8888_UNORM, PIPE_FORMAT_BGRX8888_UNORM, PIPE_FORMAT_BGRA8888_SRGB, |