1 From ee18f89c49927f6696df2d557837acc9bfd71f71 Mon Sep 17 00:00:00 2001
2 From: "Wladimir J. van der Laan" <laanwj@gmail.com>
3 Date: Fri, 3 Feb 2017 09:30:53 +0000
4 Subject: [PATCH 2/2] Revert "Subject: [PATCH] etnaviv: add RGBX/RGBA pixel
6 Organization: O.S. Systems Software LTDA.
8 This reverts commit 89bb5c79e29613ad9a4e43d670654e98a220fc60.
10 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
11 Signed-off-by: Fabio Estevam <festevam@gmail.com>
13 src/gallium/drivers/etnaviv/etnaviv_format.c | 5 -----
14 1 file changed, 5 deletions(-)
16 diff --git a/src/gallium/drivers/etnaviv/etnaviv_format.c b/src/gallium/drivers/etnaviv/etnaviv_format.c
17 index 0794603b2f..693558476b 100644
18 --- a/src/gallium/drivers/etnaviv/etnaviv_format.c
19 +++ b/src/gallium/drivers/etnaviv/etnaviv_format.c
20 @@ -141,8 +141,6 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = {
21 V_(R16G16_SSCALED, SHORT, NONE),
22 V_(R16G16_FLOAT, HALF_FLOAT, NONE),
24 - V_(A8B8G8R8_UNORM, UNSIGNED_BYTE, NONE),
26 V_(R8G8B8A8_UNORM, UNSIGNED_BYTE, A8B8G8R8),
27 V_(R8G8B8A8_SNORM, BYTE, A8B8G8R8),
28 _T(R8G8B8X8_UNORM, X8B8G8R8, X8B8G8R8),
29 @@ -151,9 +149,6 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = {
30 V_(R8G8B8A8_USCALED, UNSIGNED_BYTE, A8B8G8R8),
31 V_(R8G8B8A8_SSCALED, BYTE, A8B8G8R8),
33 - _T(R8G8B8A8_UNORM, A8B8G8R8, A8B8G8R8),
34 - _T(R8G8B8X8_UNORM, X8B8G8R8, X8B8G8R8),
36 _T(B8G8R8A8_UNORM, A8R8G8B8, A8R8G8B8),
37 _T(B8G8R8X8_UNORM, X8R8G8B8, X8R8G8B8),