diff options
| author | Marek Olšák <[email protected]> | 2016-04-24 11:51:52 +0200 |
|---|---|---|
| committer | Rob Herring <[email protected]> | 2017-07-13 14:36:47 -0500 |
| commit | f33d8af7aa354d00808f8bfd55028c396c706635 (patch) | |
| tree | c9223de58d77c88c731eca76e87f99a8f03bf99e /src/gallium/state_trackers/dri/dri2.c | |
| parent | 5a9fb2eabc1e6ef7ed0b99683d8d9eb7e1a2c1ea (diff) | |
st/dri: add 32-bit RGBX/RGBA formats
Add support for 32-bit RGBX/RGBA formats which are required for Android.
The original patch (commit ccdcf91104a5) was reverted (commit
c0c6ca40a25e) in mesa as it broke GLX resulting in swapped colors. Based
on further investigation by Chad Versace, moving the RGBX/RGBA configs
to the end is enough to prevent breaking GLX.
The handling of RGBA/RGBX in dri_fill_st_visual is a fix from Marek
Olšák.
Cc: Eric Anholt <[email protected]>
Cc: Mauro Rossi <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/dri/dri2.c')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri2.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index 60ec38d8e44..e20b2c07536 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -186,6 +186,9 @@ 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; @@ -356,9 +359,11 @@ dri2_drawable_get_buffers(struct dri_drawable *drawable, */ switch(format) { case PIPE_FORMAT_BGRA8888_UNORM: + case PIPE_FORMAT_RGBA8888_UNORM: depth = 32; break; case PIPE_FORMAT_BGRX8888_UNORM: + case PIPE_FORMAT_RGBX8888_UNORM: depth = 24; break; case PIPE_FORMAT_B5G6R5_UNORM: @@ -434,6 +439,9 @@ 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; |