[Mesa-dev] [PATCH] i965: Disable KHR_texture_compression_astc_hdr on Gen9

[Nanley Chery]

From: Nanley Chery <nanley.g.chery at intel.com>

Although Gen9 samples from most HDR ASTC surfaces of correctly,
there currently are no software workarounds to fix the incorrect
sampling that occurs in others of certain color endpoint modes.

With this change, we are no longer failing the 14 tests from:
   dEQP-GLES3.functional.texture.compressed.astc.endpoint_value_hdr_cem_15.*

Signed-off-by: Nanley Chery <nanley.g.chery at intel.com>
---
 src/mesa/drivers/dri/i965/brw_surface_formats.c | 6 +++---
 src/mesa/drivers/dri/i965/intel_extensions.c    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index fa7878d..107a3bd 100644
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -885,14 +885,14 @@ translate_tex_format(struct brw_context *brw,
       GLuint brw_fmt = brw_format_for_mesa_format(mesa_format);
 
       /**
-       * On Gen9+, it is possible to process these formats using the LDR
-       * Profile or the Full Profile mode of the hardware. Because, it isn't
+       * It is possible to process these formats using the LDR Profile
+       * or the Full Profile mode of the hardware. Because, it isn't
        * possible to determine if an HDR or LDR texture is being rendered, we
        * can't determine which mode to enable in the hardware. Therefore, to
        * handle all cases, always default to Full profile unless we are
        * processing sRGBs, which are incompatible with this mode.
        */
-      if (brw->gen >= 9)
+      if (ctx->Extensions.KHR_texture_compression_astc_hdr)
          brw_fmt |= GEN9_SURFACE_ASTC_HDR_FORMAT_BIT;
 
       return brw_fmt;
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 60ac124..c417e2b 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -371,7 +371,6 @@ intelInitExtensions(struct gl_context *ctx)
 
    if (brw->gen >= 9) {
       ctx->Extensions.KHR_texture_compression_astc_ldr = true;
-      ctx->Extensions.KHR_texture_compression_astc_hdr = true;
       ctx->Extensions.ARB_shader_stencil_export = true;
    }
 
-- 
2.8.0