[Mesa-dev] [PATCH] isl/format: Correct ASTC entries of format info table
Jason Ekstrand
jason at jlekstrand.net
Sat Oct 22 05:47:53 UTC 2016
Are there separate formats for HDR? I'm not seeing any. I guess since the
HDR is a strict superset of LDR, it doesn't make much sense to have
separate enums. In any case, thanks for fixing this!
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Helper functions are so much better...
On Fri, Oct 21, 2016 at 3:50 PM, Nanley Chery <nanleychery at gmail.com> wrote:
> With the isl_format_supports* helpers, we can now conveniently
> report support for this format on Cherry View.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92925
> Signed-off-by: Nanley Chery <nanley.g.chery at intel.com>
> ---
> src/intel/isl/isl_format.c | 70 +++++++++++++++++++++++++++---
> ----------------
> 1 file changed, 42 insertions(+), 28 deletions(-)
>
> diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
> index daf2d81..98806f4 100644
> --- a/src/intel/isl/isl_format.c
> +++ b/src/intel/isl/isl_format.c
> @@ -307,34 +307,34 @@ static const struct surface_format_info
> format_info[] = {
> SF(80, 80, x, x, x, x, x, x, x, x, ETC2_EAC_SRGB8_A8)
> SF(90, x, x, x, x, x, 75, x, x, x, R8G8B8_UINT)
> SF(90, x, x, x, x, x, 75, x, x, x, R8G8B8_SINT)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_4X4_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X4_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X5_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_6X5_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_6X6_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X5_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X6_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X8_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X5_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X6_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X8_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X10_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_12X10_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_12X12_FLT16)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_4X4_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X4_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X5_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_6X5_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_6X6_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X5_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X6_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X8_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X5_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X6_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X8_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x,
> ASTC_LDR_2D_10X10_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x,
> ASTC_LDR_2D_12X10_U8SRGB)
> - SF(80, 80, x, x, x, x, x, x, x, x,
> ASTC_LDR_2D_12X12_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_4X4_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X4_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X5_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_6X5_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_6X6_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X5_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X6_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X8_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X5_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X6_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X8_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X10_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_12X10_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_12X12_FLT16)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_4X4_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X4_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5X5_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_6X5_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_6X6_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X5_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X6_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_8X8_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X5_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X6_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x, ASTC_LDR_2D_10X8_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x,
> ASTC_LDR_2D_10X10_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x,
> ASTC_LDR_2D_12X10_U8SRGB)
> + SF(90, 90, x, x, x, x, x, x, x, x,
> ASTC_LDR_2D_12X12_U8SRGB)
> };
> #undef x
> #undef Y
> @@ -379,6 +379,13 @@ isl_format_supports_sampling(const struct
> gen_device_info *devinfo,
> */
> if (fmtl->txc == ISL_TXC_ETC1 || fmtl->txc == ISL_TXC_ETC2)
> return true;
> + } else if (devinfo->is_cherryview) {
> + const struct isl_format_layout *fmtl =
> isl_format_get_layout(format);
> + /* Support for ASTC exists on Cherry View even though big-core
> + * GPUs didn't get it until Skylake.
> + */
> + if (fmtl->txc == ISL_TXC_ASTC)
> + return true;
> }
>
> return format_gen(devinfo) >= format_info[format].sampling;
> @@ -398,6 +405,13 @@ isl_format_supports_filtering(const struct
> gen_device_info *devinfo,
> */
> if (fmtl->txc == ISL_TXC_ETC1 || fmtl->txc == ISL_TXC_ETC2)
> return true;
> + } else if (devinfo->is_cherryview) {
> + const struct isl_format_layout *fmtl =
> isl_format_get_layout(format);
> + /* Support for ASTC exists on Cherry View even though big-core
> + * GPUs didn't get it until Skylake.
> + */
> + if (fmtl->txc == ISL_TXC_ASTC)
> + return true;
> }
>
> return format_gen(devinfo) >= format_info[format].filtering;
> --
> 2.10.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20161021/69d26989/attachment-0001.html>
More information about the mesa-dev
mailing list