From fce089c8a2d19480d65d217826a7399fc57019f8 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 21 Feb 2019 21:36:05 -0800 Subject: [PATCH] iris: Drop RGBX -> RGBA for storage image usages GLSL doesn't expose RGB/RGBX image formats, so this isn't needed. --- src/gallium/drivers/iris/iris_formats.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c index 969405154b3..8a53bc19f3f 100644 --- a/src/gallium/drivers/iris/iris_formats.c +++ b/src/gallium/drivers/iris/iris_formats.c @@ -371,13 +371,10 @@ iris_format_for_usage(const struct gen_device_info *devinfo, enum isl_format format = iris_isl_format_for_pipe_format(pformat); - /* Convert RGBX into RGBA for rendering or typed image access. */ + /* Convert RGBX into RGBA for rendering */ if (isl_format_is_rgbx(format) && - (((usage & ISL_SURF_USAGE_RENDER_TARGET_BIT) && - !isl_format_supports_rendering(devinfo, format)) || - ((usage & ISL_SURF_USAGE_STORAGE_BIT) && - !(isl_format_supports_typed_writes(devinfo, format) && - isl_format_supports_typed_reads(devinfo, format))))) { + (usage & ISL_SURF_USAGE_RENDER_TARGET_BIT) && + !isl_format_supports_rendering(devinfo, format)) { format = isl_format_rgbx_to_rgba(format); }