[Mesa-dev] [PATCH 5/9] gallium: remove format aliases

[Christian König]

They are incomplete and don't make to much sense.

Signed-off-by: Christian König <deathsimple at vodafone.de>
---
 src/gallium/include/pipe/p_format.h                |    4 ----
 .../d3d1x/d3d1xstutil/src/dxgi_enums.cpp           |    2 +-
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index c05629b..c58f390 100644
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -234,10 +234,6 @@ enum pipe_format {
    PIPE_FORMAT_IYUV                    = 165,  /**< aka I420 */
    PIPE_FORMAT_NV12                    = 166,
    PIPE_FORMAT_NV21                    = 167,
-   PIPE_FORMAT_AYUV                    = PIPE_FORMAT_A8R8G8B8_UNORM,
-   PIPE_FORMAT_VUYA                    = PIPE_FORMAT_B8G8R8A8_UNORM,
-   PIPE_FORMAT_XYUV                    = PIPE_FORMAT_X8R8G8B8_UNORM,
-   PIPE_FORMAT_VUYX                    = PIPE_FORMAT_B8G8R8X8_UNORM,
 
    PIPE_FORMAT_R4A4_UNORM              = 168,
    PIPE_FORMAT_A4R4_UNORM              = 169,
diff --git a/src/gallium/state_trackers/d3d1x/d3d1xstutil/src/dxgi_enums.cpp b/src/gallium/state_trackers/d3d1x/d3d1xstutil/src/dxgi_enums.cpp
index d6dcae0..6802773 100644
--- a/src/gallium/state_trackers/d3d1x/d3d1xstutil/src/dxgi_enums.cpp
+++ b/src/gallium/state_trackers/d3d1x/d3d1xstutil/src/dxgi_enums.cpp
@@ -131,7 +131,7 @@ pipe_format dxgi_to_pipe_format[DXGI_FORMAT_COUNT] =
 	PIPE_FORMAT_NONE, /* PIPE_FORMAT_BC7_TYPELESS */
 	PIPE_FORMAT_NONE, /* PIPE_FORMAT_BC7_UNORM */
 	PIPE_FORMAT_NONE, /* PIPE_FORMAT_BC7_UNORM_SRGB */
-	PIPE_FORMAT_AYUV,
+	PIPE_FORMAT_A8R8G8B8_UNORM, /* PIPE_FORMAT_AYUV */
 	PIPE_FORMAT_NONE, /* PIPE_FORMAT_Y410 */
 	PIPE_FORMAT_NONE, /* PIPE_FORMAT_Y416 */
 	PIPE_FORMAT_NV12,
-- 
1.7.5.4