summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <[email protected]>2012-03-02 13:11:12 +0100
committerChristian König <[email protected]>2012-03-08 11:37:02 +0100
commitd6119ac9facac23dbfaf40a582287785c190b5da (patch)
treec8cedac4d6d462f0f49db969e0fa05e12ea77a7f
parentd5fc3746fe3a337bccba0d644543633b728b9444 (diff)
gallium: remove format aliases
They are incomplete and don't make to much sense. Signed-off-by: Christian König <[email protected]>
-rw-r--r--src/gallium/include/pipe/p_format.h4
-rw-r--r--src/gallium/state_trackers/d3d1x/d3d1xstutil/src/dxgi_enums.cpp2
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 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,