[PATCH] Complete ARGB8888 naming convention format renames missed

Scott Moreau oreaus at gmail.com
Tue Jan 17 01:42:00 PST 2012 

by 58dc1b28d1ef4d1931c52b079d304f2e1546329d.

---
 .../state_trackers/egl/wayland/native_shm.c        |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.c
b/src/gallium/state_trackers/egl/wayland/native_shm.c
index b76e5db..7d83e78 100644
--- a/src/gallium/state_trackers/egl/wayland/native_shm.c
+++ b/src/gallium/state_trackers/egl/wayland/native_shm.c
@@ -94,11 +94,10 @@ wayland_create_shm_buffer(struct wayland_display
*display,

    switch (surface->color_format) {
    case PIPE_FORMAT_B8G8R8A8_UNORM:
-      format =3D (surface->premultiplied_alpha) ?
-         WL_SHM_FORMAT_PREMULTIPLIED_ARGB32 : WL_SHM_FORMAT_ARGB32;
+      format =3D WL_SHM_FORMAT_ARGB8888;
       break;
    case PIPE_FORMAT_B8G8R8X8_UNORM:
-      format =3D WL_SHM_FORMAT_XRGB32;
+      format =3D WL_SHM_FORMAT_XRGB8888;
       break;
    default:
       return NULL;
@@ -116,7 +115,7 @@ shm_handle_format(void *data, struct wl_shm *shm,
uint32_t format)
    struct wayland_shm_display *shmdpy =3D data;

    switch (format) {
-   case WL_SHM_FORMAT_ARGB32:
+   case WL_SHM_FORMAT_ARGB8888:
       shmdpy->base.formats |=3D HAS_ARGB8888;
       break;
    case WL_SHM_FORMAT_XRGB8888:
--=20
1.7.4.1

--000e0ce0049eeeafd904b6b65080
Content-Type: text/html; charset=windows-1252
Content-Transfer-Encoding: quoted-printable

Looks like a few renames were missed in 58dc1b28d1ef4d1931c52b079d304f2e154=
6329d as mesa failed to build with:<br><br>wayland/native_shm.c: In functio=
n =91wayland_create_shm_buffer=92:<br>wayland/native_shm.c:98:10: error: =
=91WL_SHM_FORMAT_PREMULTIPLIED_ARGB32=92 undeclared (first use in this func=
tion)<br>
wayland/native_shm.c:98:10: note: each undeclared identifier is reported on=
ly once for each function it appears in<br>wayland/native_shm.c:98:47: erro=
r: =91WL_SHM_FORMAT_ARGB32=92 undeclared (first use in this function)<br>wa=
yland/native_shm.c:101:16: error: =91WL_SHM_FORMAT_XRGB32=92 undeclared (fi=
rst use in this function)<br>
wayland/native_shm.c: In function =91shm_handle_format=92:<br>wayland/nativ=
e_shm.c:119:9: error: =91WL_SHM_FORMAT_ARGB32=92 undeclared (first use in t=
his function)<br>make[4]: *** [wayland/native_shm.o] Error 1<br><br>Attache=
d is a patch that finishes renaming the relevant variables.<br>
<br>From 962a6f35d95edaba0ab44187901afdb37b9f206d Mon Sep 17 00:00:00 2001<=
br>From: Scott Moreau &lt;<a href=3D"mailto:oreaus at gmail.com">oreaus at gmail.=
com</a>&gt;<br>Date: Tue, 17 Jan 2012 02:42:00 -0700<br>Subject: [PATCH] Co=
mplete ARGB8888 naming convention format renames missed by 58dc1b28d1ef4d19=
31c52b079d304f2e1546329d.<br>
<br>---<br>=A0.../state_trackers/egl/wayland/native_shm.c=A0=A0=A0=A0=A0=A0=
=A0 |=A0=A0=A0 7 +++----<br>=A01 files changed, 3 insertions(+), 4 deletion=
s(-)<br><br>diff --git a/src/gallium/state_trackers/egl/wayland/native_shm.=
c b/src/gallium/state_trackers/egl/wayland/native_shm.c<br>
index b76e5db..7d83e78 100644<br>--- a/src/gallium/state_trackers/egl/wayla=
nd/native_shm.c<br>+++ b/src/gallium/state_trackers/egl/wayland/native_shm.=
c<br>@@ -94,11 +94,10 @@ wayland_create_shm_buffer(struct wayland_display *=
display,<br>
=A0<br>=A0=A0=A0 switch (surface-&gt;color_format) {<br>=A0=A0=A0 case PIPE=
_FORMAT_B8G8R8A8_UNORM:<br>-=A0=A0=A0=A0=A0 format =3D (surface-&gt;premult=
iplied_alpha) ?<br>-=A0=A0=A0=A0=A0=A0=A0=A0 WL_SHM_FORMAT_PREMULTIPLIED_AR=
GB32 : WL_SHM_FORMAT_ARGB32;<br>+=A0=A0=A0=A0=A0 format =3D WL_SHM_FORMAT_A=
RGB8888;<br>
=A0=A0=A0=A0=A0=A0 break;<br>=A0=A0=A0 case PIPE_FORMAT_B8G8R8X8_UNORM:<br>=
-=A0=A0=A0=A0=A0 format =3D WL_SHM_FORMAT_XRGB32;<br>+=A0=A0=A0=A0=A0 forma=
t =3D WL_SHM_FORMAT_XRGB8888;<br>=A0=A0=A0=A0=A0=A0 break;<br>=A0=A0=A0 def=
ault:<br>=A0=A0=A0=A0=A0=A0 return NULL;<br>@@ -116,7 +115,7 @@ shm_handle_=
format(void *data, struct wl_shm *shm, uint32_t format)<br>
=A0=A0=A0 struct wayland_shm_display *shmdpy =3D data;<br>=A0<br>=A0=A0=A0 =
switch (format) {<br>-=A0=A0 case WL_SHM_FORMAT_ARGB32:<br>+=A0=A0 case WL_=
SHM_FORMAT_ARGB8888:<br>=A0=A0=A0=A0=A0=A0 shmdpy-&gt;base.formats |=3D HAS=
_ARGB8888;<br>=A0=A0=A0=A0=A0=A0 break;<br>=A0=A0=A0 case WL_SHM_FORMAT_XRG=
B8888:<br>
-- <br>1.7.4.1<br><br><br>

--000e0ce0049eeeafd904b6b65080--
--000e0ce0049eeeafe104b6b65082
Content-Type: text/x-patch; charset=US-ASCII; 
	name="0001-Complete-ARGB8888-naming-convention-format-renames-m.patch"
Content-Disposition: attachment; 
	filename="0001-Complete-ARGB8888-naming-convention-format-renames-m.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gxiqpuyh0

RnJvbSA5NjJhNmYzNWQ5NWVkYWJhMGFiNDQxODc5MDFhZmRiMzdiOWYyMDZkIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBTY290dCBNb3JlYXUgPG9yZWF1c0BnbWFpbC5jb20+CkRhdGU6
IFR1ZSwgMTcgSmFuIDIwMTIgMDI6NDI6MDAgLTA3MDAKU3ViamVjdDogW1BBVENIXSBDb21wbGV0
ZSBBUkdCODg4OCBuYW1pbmcgY29udmVudGlvbiBmb3JtYXQgcmVuYW1lcyBtaXNzZWQgYnkgNThk
YzFiMjhkMWVmNGQxOTMxYzUyYjA3OWQzMDRmMmUxNTQ2MzI5ZC4KCi0tLQogLi4uL3N0YXRlX3Ry
YWNrZXJzL2VnbC93YXlsYW5kL25hdGl2ZV9zaG0uYyAgICAgICAgfCAgICA3ICsrKy0tLS0KIDEg
ZmlsZXMgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp
dCBhL3NyYy9nYWxsaXVtL3N0YXRlX3RyYWNrZXJzL2VnbC93YXlsYW5kL25hdGl2ZV9zaG0uYyBi
L3NyYy9nYWxsaXVtL3N0YXRlX3RyYWNrZXJzL2VnbC93YXlsYW5kL25hdGl2ZV9zaG0uYwppbmRl
eCBiNzZlNWRiLi43ZDgzZTc4IDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9zdGF0ZV90cmFja2Vy
cy9lZ2wvd2F5bGFuZC9uYXRpdmVfc2htLmMKKysrIGIvc3JjL2dhbGxpdW0vc3RhdGVfdHJhY2tl
cnMvZWdsL3dheWxhbmQvbmF0aXZlX3NobS5jCkBAIC05NCwxMSArOTQsMTAgQEAgd2F5bGFuZF9j
cmVhdGVfc2htX2J1ZmZlcihzdHJ1Y3Qgd2F5bGFuZF9kaXNwbGF5ICpkaXNwbGF5LAogCiAgICBz
d2l0Y2ggKHN1cmZhY2UtPmNvbG9yX2Zvcm1hdCkgewogICAgY2FzZSBQSVBFX0ZPUk1BVF9COEc4
UjhBOF9VTk9STToKLSAgICAgIGZvcm1hdCA9IChzdXJmYWNlLT5wcmVtdWx0aXBsaWVkX2FscGhh
KSA/Ci0gICAgICAgICBXTF9TSE1fRk9STUFUX1BSRU1VTFRJUExJRURfQVJHQjMyIDogV0xfU0hN
X0ZPUk1BVF9BUkdCMzI7CisgICAgICBmb3JtYXQgPSBXTF9TSE1fRk9STUFUX0FSR0I4ODg4Owog
ICAgICAgYnJlYWs7CiAgICBjYXNlIFBJUEVfRk9STUFUX0I4RzhSOFg4X1VOT1JNOgotICAgICAg
Zm9ybWF0ID0gV0xfU0hNX0ZPUk1BVF9YUkdCMzI7CisgICAgICBmb3JtYXQgPSBXTF9TSE1fRk9S
TUFUX1hSR0I4ODg4OwogICAgICAgYnJlYWs7CiAgICBkZWZhdWx0OgogICAgICAgcmV0dXJuIE5V
TEw7CkBAIC0xMTYsNyArMTE1LDcgQEAgc2htX2hhbmRsZV9mb3JtYXQodm9pZCAqZGF0YSwgc3Ry
dWN0IHdsX3NobSAqc2htLCB1aW50MzJfdCBmb3JtYXQpCiAgICBzdHJ1Y3Qgd2F5bGFuZF9zaG1f
ZGlzcGxheSAqc2htZHB5ID0gZGF0YTsKIAogICAgc3dpdGNoIChmb3JtYXQpIHsKLSAgIGNhc2Ug
V0xfU0hNX0ZPUk1BVF9BUkdCMzI6CisgICBjYXNlIFdMX1NITV9GT1JNQVRfQVJHQjg4ODg6CiAg
ICAgICBzaG1kcHktPmJhc2UuZm9ybWF0cyB8PSBIQVNfQVJHQjg4ODg7CiAgICAgICBicmVhazsK
ICAgIGNhc2UgV0xfU0hNX0ZPUk1BVF9YUkdCODg4ODoKLS0gCjEuNy40LjEKCg==
--000e0ce0049eeeafe104b6b65082--

More information about the wayland-devel mailing list