i965: Disable KHR_texture_compression_astc_hdr on Gen9

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@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c
index aa8a0a12fa5ff3dbcb635009ab1208d54df44251..c65f0d35235d0fa58f4978a62a97ed362502c041 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_surface_formats.c
+++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c
@@ -884,14 +884,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 6a20bd6d9256dee388c8548aedd1c1688bd2a51c..907f24f244d873728ad8a95d084819f3b9601ef6 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -372,7 +372,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;
    }