diff options
| -rw-r--r-- | src/gallium/auxiliary/util/u_format.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_format.csv | 6 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_format.h | 22 |
3 files changed, 0 insertions, 30 deletions
diff --git a/src/gallium/auxiliary/util/u_format.c b/src/gallium/auxiliary/util/u_format.c index 73c25d727ba..33643615294 100644 --- a/src/gallium/auxiliary/util/u_format.c +++ b/src/gallium/auxiliary/util/u_format.c @@ -956,8 +956,6 @@ util_format_snorm8_to_sint8(enum pipe_format format) return PIPE_FORMAT_R8G8B8X8_SINT; case PIPE_FORMAT_R8A8_SNORM: return PIPE_FORMAT_R8A8_SINT; - case PIPE_FORMAT_A8L8_SNORM: - return PIPE_FORMAT_A8L8_SINT; case PIPE_FORMAT_G8R8_SNORM: return PIPE_FORMAT_G8R8_SINT; case PIPE_FORMAT_A8B8G8R8_SNORM: diff --git a/src/gallium/auxiliary/util/u_format.csv b/src/gallium/auxiliary/util/u_format.csv index 926f881e590..089dda933d7 100644 --- a/src/gallium/auxiliary/util/u_format.csv +++ b/src/gallium/auxiliary/util/u_format.csv @@ -469,12 +469,6 @@ PIPE_FORMAT_R10G10B10A2_UINT , plain, 1, 1, 1, up10 , up10 , up10, up2 , PIPE_FORMAT_B5G6R5_SRGB , plain, 1, 1, 1, un5 , un6 , un5 , , zyx1, srgb, un5 , un6 , un5 , , xyz1 -PIPE_FORMAT_A8L8_UNORM , plain, 1, 1, 1, un8 , un8 , , , yyyx, rgb -PIPE_FORMAT_A8L8_SNORM , plain, 1, 1, 1, sn8 , sn8 , , , yyyx, rgb -PIPE_FORMAT_A8L8_SINT , plain, 1, 1, 1, sp8 , sp8 , , , yyyx, rgb -PIPE_FORMAT_A8L8_SRGB , plain, 1, 1, 1, un8 , un8 , , , yyyx, srgb -PIPE_FORMAT_A16L16_UNORM , plain, 1, 1, 1, un16, un16, , , yyyx, rgb - PIPE_FORMAT_G8R8_UNORM , plain, 1, 1, 1, un8 , un8 , , , yx01, rgb PIPE_FORMAT_G8R8_SNORM , plain, 1, 1, 1, sn8 , sn8 , , , yx01, rgb PIPE_FORMAT_G8R8_SINT , plain, 1, 1, 1, sp8 , sp8 , , , yx01, rgb diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index 620e192e20c..2da480d6dce 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -335,11 +335,6 @@ enum pipe_format { PIPE_FORMAT_BPTC_RGB_FLOAT, PIPE_FORMAT_BPTC_RGB_UFLOAT, - PIPE_FORMAT_A8L8_UNORM, - PIPE_FORMAT_A8L8_SNORM, - PIPE_FORMAT_A8L8_SRGB, - PIPE_FORMAT_A16L16_UNORM, - PIPE_FORMAT_G8R8_UNORM, PIPE_FORMAT_G8R8_SNORM, PIPE_FORMAT_G16R16_UNORM, @@ -420,7 +415,6 @@ enum pipe_format { PIPE_FORMAT_R8_SRGB, - PIPE_FORMAT_A8L8_SINT, PIPE_FORMAT_G8R8_SINT, PIPE_FORMAT_A8B8G8R8_SINT, PIPE_FORMAT_X8B8G8R8_SINT, @@ -458,14 +452,6 @@ enum pipe_format { #define PIPE_FORMAT_XRGB8888_SRGB PIPE_FORMAT_X8R8G8B8_SRGB #define PIPE_FORMAT_ABGR8888_SRGB PIPE_FORMAT_A8B8G8R8_SRGB #define PIPE_FORMAT_XBGR8888_SRGB PIPE_FORMAT_X8B8G8R8_SRGB -#define PIPE_FORMAT_LA88_UNORM PIPE_FORMAT_L8A8_UNORM -#define PIPE_FORMAT_AL88_UNORM PIPE_FORMAT_A8L8_UNORM -#define PIPE_FORMAT_LA88_SNORM PIPE_FORMAT_L8A8_SNORM -#define PIPE_FORMAT_AL88_SNORM PIPE_FORMAT_A8L8_SNORM -#define PIPE_FORMAT_LA88_SRGB PIPE_FORMAT_L8A8_SRGB -#define PIPE_FORMAT_AL88_SRGB PIPE_FORMAT_A8L8_SRGB -#define PIPE_FORMAT_LA1616_UNORM PIPE_FORMAT_L16A16_UNORM -#define PIPE_FORMAT_AL1616_UNORM PIPE_FORMAT_A16L16_UNORM #define PIPE_FORMAT_RG88_UNORM PIPE_FORMAT_R8G8_UNORM #define PIPE_FORMAT_GR88_UNORM PIPE_FORMAT_G8R8_UNORM #define PIPE_FORMAT_RG88_SNORM PIPE_FORMAT_R8G8_SNORM @@ -495,14 +481,6 @@ enum pipe_format { #define PIPE_FORMAT_BGRX8888_SRGB PIPE_FORMAT_X8R8G8B8_SRGB #define PIPE_FORMAT_RGBA8888_SRGB PIPE_FORMAT_A8B8G8R8_SRGB #define PIPE_FORMAT_RGBX8888_SRGB PIPE_FORMAT_X8B8G8R8_SRGB -#define PIPE_FORMAT_LA88_UNORM PIPE_FORMAT_A8L8_UNORM -#define PIPE_FORMAT_AL88_UNORM PIPE_FORMAT_L8A8_UNORM -#define PIPE_FORMAT_LA88_SNORM PIPE_FORMAT_A8L8_SNORM -#define PIPE_FORMAT_AL88_SNORM PIPE_FORMAT_L8A8_SNORM -#define PIPE_FORMAT_LA88_SRGB PIPE_FORMAT_A8L8_SRGB -#define PIPE_FORMAT_AL88_SRGB PIPE_FORMAT_L8A8_SRGB -#define PIPE_FORMAT_LA1616_UNORM PIPE_FORMAT_A16L16_UNORM -#define PIPE_FORMAT_AL1616_UNORM PIPE_FORMAT_L16A16_UNORM #define PIPE_FORMAT_RG88_UNORM PIPE_FORMAT_G8R8_UNORM #define PIPE_FORMAT_GR88_UNORM PIPE_FORMAT_R8G8_UNORM #define PIPE_FORMAT_RG88_SNORM PIPE_FORMAT_G8R8_SNORM |