freedreno/a6xx: RB6_R8G8B8 is actually 32 bit RGBX
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Kristian H. Kristensen <hoegsberg@google.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/2848>
This commit is contained in:
@@ -26,7 +26,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd">
|
||||
<value value="0x18" name="RB6_R16_UINT"/>
|
||||
<value value="0x19" name="RB6_R16_SINT"/>
|
||||
<value value="0x30" name="RB6_R8G8B8A8_UNORM"/>
|
||||
<value value="0x31" name="RB6_R8G8B8_UNORM"/>
|
||||
<value value="0x31" name="RB6_R8G8B8X8_UNORM"/> <!-- 32 bpp format, samples 1 for alpha -->
|
||||
<value value="0x32" name="RB6_R8G8B8A8_SNORM"/>
|
||||
<value value="0x33" name="RB6_R8G8B8A8_UINT"/>
|
||||
<value value="0x34" name="RB6_R8G8B8A8_SINT"/>
|
||||
|
||||
@@ -345,7 +345,7 @@ tu6_rb_fmt_to_ifmt(enum a6xx_color_fmt fmt)
|
||||
case RB6_R8G8_UNORM:
|
||||
case RB6_R8G8_SNORM:
|
||||
case RB6_R8G8B8A8_UNORM:
|
||||
case RB6_R8G8B8_UNORM:
|
||||
case RB6_R8G8B8X8_UNORM:
|
||||
case RB6_R8G8B8A8_SNORM:
|
||||
case RB6_R4G4B4A4_UNORM:
|
||||
case RB6_R5G5B5A1_UNORM:
|
||||
|
||||
@@ -176,9 +176,9 @@ static struct fd6_format formats[PIPE_FORMAT_COUNT] = {
|
||||
_T(L16A16_SINT, 16_16_SINT, NONE, WZYX),
|
||||
|
||||
VT(R8G8B8A8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
|
||||
_T(R8G8B8X8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
|
||||
_T(R8G8B8X8_UNORM, 8_8_8_8_UNORM, R8G8B8X8_UNORM, WZYX),
|
||||
_T(R8G8B8A8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
|
||||
_T(R8G8B8X8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WZYX),
|
||||
_T(R8G8B8X8_SRGB, 8_8_8_8_UNORM, R8G8B8X8_UNORM, WZYX),
|
||||
VT(R8G8B8A8_SNORM, 8_8_8_8_SNORM, R8G8B8A8_SNORM, WZYX),
|
||||
VT(R8G8B8A8_UINT, 8_8_8_8_UINT, R8G8B8A8_UINT, WZYX),
|
||||
VT(R8G8B8A8_SINT, 8_8_8_8_SINT, R8G8B8A8_SINT, WZYX),
|
||||
@@ -186,19 +186,19 @@ static struct fd6_format formats[PIPE_FORMAT_COUNT] = {
|
||||
V_(R8G8B8A8_SSCALED, 8_8_8_8_SINT, NONE, WZYX),
|
||||
|
||||
VT(B8G8R8A8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WXYZ),
|
||||
_T(B8G8R8X8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WXYZ),
|
||||
_T(B8G8R8X8_UNORM, 8_8_8_8_UNORM, R8G8B8X8_UNORM, WXYZ),
|
||||
VT(B8G8R8A8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WXYZ),
|
||||
_T(B8G8R8X8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, WXYZ),
|
||||
_T(B8G8R8X8_SRGB, 8_8_8_8_UNORM, R8G8B8X8_UNORM, WXYZ),
|
||||
|
||||
VT(A8B8G8R8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, XYZW),
|
||||
_T(X8B8G8R8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, XYZW),
|
||||
_T(X8B8G8R8_UNORM, 8_8_8_8_UNORM, R8G8B8X8_UNORM, XYZW),
|
||||
_T(A8B8G8R8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, XYZW),
|
||||
_T(X8B8G8R8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, XYZW),
|
||||
_T(X8B8G8R8_SRGB, 8_8_8_8_UNORM, R8G8B8X8_UNORM, XYZW),
|
||||
|
||||
VT(A8R8G8B8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, ZYXW),
|
||||
_T(X8R8G8B8_UNORM, 8_8_8_8_UNORM, R8G8B8A8_UNORM, ZYXW),
|
||||
_T(X8R8G8B8_UNORM, 8_8_8_8_UNORM, R8G8B8X8_UNORM, ZYXW),
|
||||
_T(A8R8G8B8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, ZYXW),
|
||||
_T(X8R8G8B8_SRGB, 8_8_8_8_UNORM, R8G8B8A8_UNORM, ZYXW),
|
||||
_T(X8R8G8B8_SRGB, 8_8_8_8_UNORM, R8G8B8X8_UNORM, ZYXW),
|
||||
|
||||
VT(R10G10B10A2_UNORM, 10_10_10_2_UNORM, R10G10B10A2_UNORM, WZYX),
|
||||
VT(B10G10R10A2_UNORM, 10_10_10_2_UNORM, R10G10B10A2_UNORM, WXYZ),
|
||||
|
||||
@@ -60,7 +60,7 @@ fd6_ifmt(enum a6xx_color_fmt fmt)
|
||||
case RB6_R8G8_UNORM:
|
||||
case RB6_R8G8_SNORM:
|
||||
case RB6_R8G8B8A8_UNORM:
|
||||
case RB6_R8G8B8_UNORM:
|
||||
case RB6_R8G8B8X8_UNORM:
|
||||
case RB6_R8G8B8A8_SNORM:
|
||||
return R2D_UNORM8;
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ ok_ubwc_format(enum pipe_format pfmt)
|
||||
case RB6_R8G8B8A8_SINT:
|
||||
case RB6_R8G8B8A8_UINT:
|
||||
case RB6_R8G8B8A8_UNORM:
|
||||
case RB6_R8G8B8_UNORM:
|
||||
case RB6_R8G8B8X8_UNORM:
|
||||
case RB6_R8G8_SINT:
|
||||
case RB6_R8G8_UINT:
|
||||
case RB6_R8G8_UNORM:
|
||||
|
||||
Reference in New Issue
Block a user