From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Sun, 29 Jan 2012 16:28:50 +0000 (+0100)
Subject: st/dri: Support 24bit formats in dri2_allocate_buffer
X-Git-Tag: android-x86-4.4-r1~7285
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c72d7df16879e3210946ba92a7edc823815b6f16;p=android-x86%2Fexternal-mesa.git

st/dri: Support 24bit formats in dri2_allocate_buffer

Prior commit 576161289df68eedade591fbca4013329c9e5ded,
the parameter format was bpp, thus both 24bit and 32bit formats were
requested with format set to 32. Handle 24bit seperately now.

Fixes RGBX formats in wayland platform for egl_dri2 (EGL_ALPHA_SIZE=0).

Note: This is a candidate for the 8.0 branch.
---

diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c
index afd91ee27a1..4c08a025ed2 100644
--- a/src/gallium/state_trackers/dri/drm/dri2.c
+++ b/src/gallium/state_trackers/dri/drm/dri2.c
@@ -316,6 +316,9 @@ dri2_allocate_buffer(__DRIscreen *sPriv,
 
    switch (format) {
       case 32:
+         pf = PIPE_FORMAT_B8G8R8A8_UNORM;
+         break;
+      case 24:
          pf = PIPE_FORMAT_B8G8R8X8_UNORM;
          break;
       case 16: