diff options
| author | Michal Krol <michal@vmware.com> | 2009-12-08 15:30:10 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-12-08 15:30:10 +0100 |
| commit | 6fd8b9b550713302566bb4c28e49c219870ccfec (patch) | |
| tree | 1a7a61a639c0b5722bacc24627f71affab68c57a /src/gallium/include | |
| parent | 72befaaae5fd9555e1f6ccbd6a74c0d640fc2929 (diff) | |
Remove remaining pipe format utility functions.
Depricate pf_type(), pf_size_*(), pf_layout() and pf_exp2().
Map depricated PIPE_FORMAT_TYPE to new UTIL_FORMAT_ values:
UNKNOWN = TYPE_VOID
UNORM = TYPE_UNSIGNED + LAYOUT_ARITH
SNORM = TYPE_SIGNED + LAYOUT_ARITH
FIXED = TYPE_FIXED
FLOAT = TYPE_FLOAT
USCALED = TYPE_UNSIGNED + LAYOUT_ARRAY
SSCALED = TYPE_SIGNED + LAYOUT_ARRAY
SRGB = TYPE_COLORSPACE_SRGB
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_format.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index cc7a8ab8df..77134f664b 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -54,11 +54,6 @@ extern "C" { #define PIPE_FORMAT_LAYOUT_DXT 2 /**< XXX temporary? */ #define PIPE_FORMAT_LAYOUT_MIXED 3 -static INLINE uint pf_layout(uint f) /**< PIPE_FORMAT_LAYOUT_ */ -{ - return f & 0x3; -} - /** * RGBAZS Format Layout. */ @@ -107,19 +102,6 @@ static INLINE uint pf_layout(uint f) /**< PIPE_FORMAT_LAYOUT_ */ */ typedef uint pipe_format_rgbazs_t; -static INLINE uint pf_get(pipe_format_rgbazs_t f, uint shift, uint mask) -{ - return (f >> shift) & mask; -} - -#define pf_size_x(f) pf_get(f, 14, 0x7) /**< Size of X */ -#define pf_size_y(f) pf_get(f, 17, 0x7) /**< Size of Y */ -#define pf_size_z(f) pf_get(f, 20, 0x7) /**< Size of Z */ -#define pf_size_w(f) pf_get(f, 23, 0x7) /**< Size of W */ -#define pf_size_xyzw(f,i) pf_get(f, 14+((i)*3), 0x7) -#define pf_exp2(f) pf_get(f, 26, 0x7) /**< Scale size by 2 ^ exp2 */ -#define pf_type(f) pf_get(f, 29, 0x7) /**< PIPE_FORMAT_TYPE_ */ - /** * Helper macro to encode the above structure into a 32-bit value. */ |