diff options
| author | Eric Anholt <[email protected]> | 2018-01-09 16:09:10 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-01-12 21:56:10 -0800 |
| commit | 66f2f3ed97c4225e4d290f4b4401e74ccd33313c (patch) | |
| tree | d490c98d23cab55f78c7e7d0dfdcd233bce09cd9 | |
| parent | 469bbd8387d11bbac2aae4c49765c748c2a9fd04 (diff) | |
broadcom/vc5: Always use the RGBA8 formats for RGBX8.
The RGBX8 formats were dropped from V3D 4.x, but we don't really need them
anyway (we already handle other non-alpha formats by forcing A to 1).
| -rw-r--r-- | src/gallium/drivers/vc5/v3dx_format_table.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/drivers/vc5/v3dx_format_table.c b/src/gallium/drivers/vc5/v3dx_format_table.c index 510a3e39743..6282bf9fbb2 100644 --- a/src/gallium/drivers/vc5/v3dx_format_table.c +++ b/src/gallium/drivers/vc5/v3dx_format_table.c @@ -60,11 +60,11 @@ static const struct vc5_format format_table[] = { FORMAT(B8G8R8A8_UNORM, RGBA8, RGBA8, SWIZ_ZYXW, 16, 0), - FORMAT(B8G8R8X8_UNORM, RGBX8, RGBA8, SWIZ_ZYX1, 16, 0), + FORMAT(B8G8R8X8_UNORM, RGBA8, RGBA8, SWIZ_ZYX1, 16, 0), FORMAT(B8G8R8A8_SRGB, SRGB8_ALPHA8, RGBA8, SWIZ_ZYXW, 16, 0), - FORMAT(B8G8R8X8_SRGB, SRGBX8, RGBA8, SWIZ_ZYX1, 16, 0), + FORMAT(B8G8R8X8_SRGB, SRGB8_ALPHA8, RGBA8, SWIZ_ZYX1, 16, 0), FORMAT(R8G8B8A8_UNORM, RGBA8, RGBA8, SWIZ_XYZW, 16, 0), - FORMAT(R8G8B8X8_UNORM, RGBX8, RGBA8, SWIZ_XYZ1, 16, 0), + FORMAT(R8G8B8X8_UNORM, RGBA8, RGBA8, SWIZ_XYZ1, 16, 0), FORMAT(R8G8B8A8_SNORM, NO, RGBA8_SNORM, SWIZ_XYZW, 16, 0), FORMAT(R8G8B8X8_SNORM, NO, RGBA8_SNORM, SWIZ_XYZ1, 16, 0), FORMAT(R10G10B10A2_UNORM, RGB10_A2, RGB10_A2, SWIZ_XYZW, 16, 0), @@ -184,7 +184,9 @@ v3dX(get_internal_type_bpp_for_output_format)(uint32_t format, { switch (format) { case V3D_OUTPUT_IMAGE_FORMAT_RGBA8: +#if V3D_VERSION < 41 case V3D_OUTPUT_IMAGE_FORMAT_RGBX8: +#endif case V3D_OUTPUT_IMAGE_FORMAT_RGB8: case V3D_OUTPUT_IMAGE_FORMAT_RG8: case V3D_OUTPUT_IMAGE_FORMAT_R8: @@ -213,7 +215,9 @@ v3dX(get_internal_type_bpp_for_output_format)(uint32_t format, case V3D_OUTPUT_IMAGE_FORMAT_SRGB: case V3D_OUTPUT_IMAGE_FORMAT_RGB10_A2: case V3D_OUTPUT_IMAGE_FORMAT_R11F_G11F_B10F: +#if V3D_VERSION < 41 case V3D_OUTPUT_IMAGE_FORMAT_SRGBX8: +#endif case V3D_OUTPUT_IMAGE_FORMAT_RGBA16F: /* Note that sRGB RTs are stored in the tile buffer at 16F, * and the conversion to sRGB happens at tilebuffer |