From d6119ac9facac23dbfaf40a582287785c190b5da Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Fri, 2 Mar 2012 13:11:12 +0100 Subject: [PATCH] gallium: remove format aliases MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit They are incomplete and don't make to much sense. Signed-off-by: Christian König --- src/gallium/include/pipe/p_format.h | 4 ---- .../state_trackers/d3d1x/d3d1xstutil/src/dxgi_enums.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index c05629b616e..c58f39096b5 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 d6dcae08666..6802773ce8a 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, -- 2.30.2