gallium: fix bogus depth/stencil format names (and channel descriptions)
only the depth part is normalized, stencil part isn't.
This commit is contained in:
parent
d9eae63792
commit
9de2ee646a
|
@ -93,16 +93,15 @@ PIPE_FORMAT_R8SG8SB8UX8U_NORM , plain, 1, 1, sn8 , sn8 , un8 , x8 , xyz1, r
|
|||
PIPE_FORMAT_R5SG5SB6U_NORM , plain, 1, 1, sn5 , sn5 , un6 , , xyz1, rgb
|
||||
|
||||
# Depth-stencil formats
|
||||
# UNORM isn't really fitting. Only applies to depth, not stencil component
|
||||
PIPE_FORMAT_S8_UNORM , plain, 1, 1, un8 , , , , _x__, zs
|
||||
PIPE_FORMAT_Z16_UNORM , plain, 1, 1, un16, , , , x___, zs
|
||||
PIPE_FORMAT_Z32_UNORM , plain, 1, 1, un32, , , , x___, zs
|
||||
PIPE_FORMAT_Z32_FLOAT , plain, 1, 1, f32 , , , , x___, zs
|
||||
PIPE_FORMAT_Z24S8_UNORM , plain, 1, 1, un24, un8 , , , xy__, zs
|
||||
PIPE_FORMAT_S8Z24_UNORM , plain, 1, 1, un8 , un24, , , yx__, zs
|
||||
PIPE_FORMAT_Z24X8_UNORM , plain, 1, 1, un24, un8 , , , x___, zs
|
||||
PIPE_FORMAT_X8Z24_UNORM , plain, 1, 1, un8 , un24, , , y___, zs
|
||||
PIPE_FORMAT_Z32_FLOAT_S8X24_UNORM , plain, 1, 1, f32, un8 , un24, , xy__, zs
|
||||
PIPE_FORMAT_S8_USCALED , plain, 1, 1, u8 , , , , _x__, zs
|
||||
PIPE_FORMAT_Z16_UNORM , plain, 1, 1, un16, , , , x___, zs
|
||||
PIPE_FORMAT_Z32_UNORM , plain, 1, 1, un32, , , , x___, zs
|
||||
PIPE_FORMAT_Z32_FLOAT , plain, 1, 1, f32 , , , , x___, zs
|
||||
PIPE_FORMAT_Z24_UNORM_S8_USCALED , plain, 1, 1, un24, u8 , , , xy__, zs
|
||||
PIPE_FORMAT_S8_USCALED_Z24_UNORM , plain, 1, 1, u8 , un24, , , yx__, zs
|
||||
PIPE_FORMAT_Z24X8_UNORM , plain, 1, 1, un24, u8 , , , x___, zs
|
||||
PIPE_FORMAT_X8Z24_UNORM , plain, 1, 1, u8 , un24, , , y___, zs
|
||||
PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED , plain, 1, 1, f32, u8 , u24 , , xy__, zs
|
||||
|
||||
# YUV formats
|
||||
# http://www.fourcc.org/yuv.php#UYVY
|
||||
|
|
Can't render this file because it contains an unexpected character in line 8 and column 3.
|
|
@ -63,11 +63,11 @@ enum pipe_format {
|
|||
PIPE_FORMAT_Z16_UNORM = 16,
|
||||
PIPE_FORMAT_Z32_UNORM = 17,
|
||||
PIPE_FORMAT_Z32_FLOAT = 18,
|
||||
PIPE_FORMAT_Z24S8_UNORM = 19,
|
||||
PIPE_FORMAT_S8Z24_UNORM = 20,
|
||||
PIPE_FORMAT_Z24_UNORM_S8_USCALED = 19,
|
||||
PIPE_FORMAT_S8_USCALED_Z24_UNORM = 20,
|
||||
PIPE_FORMAT_Z24X8_UNORM = 21,
|
||||
PIPE_FORMAT_X8Z24_UNORM = 22,
|
||||
PIPE_FORMAT_S8_UNORM = 23, /**< ubyte stencil */
|
||||
PIPE_FORMAT_S8_USCALED = 23, /**< ubyte stencil */
|
||||
PIPE_FORMAT_R64_FLOAT = 24,
|
||||
PIPE_FORMAT_R64G64_FLOAT = 25,
|
||||
PIPE_FORMAT_R64G64B64_FLOAT = 26,
|
||||
|
@ -176,7 +176,7 @@ enum pipe_format {
|
|||
PIPE_FORMAT_R10G10B10A2_USCALED = 123,
|
||||
PIPE_FORMAT_R11G11B10_FLOAT = 124,
|
||||
PIPE_FORMAT_R9G9B9E5_FLOAT = 125,
|
||||
PIPE_FORMAT_Z32_FLOAT_S8X24_UNORM = 126,
|
||||
PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED = 126,
|
||||
PIPE_FORMAT_R1_UNORM = 127,
|
||||
|
||||
PIPE_FORMAT_COUNT
|
||||
|
|
Loading…
Reference in New Issue