diff options
| author | Nanley Chery <[email protected]> | 2016-04-12 17:34:49 -0700 |
|---|---|---|
| committer | Nanley Chery <[email protected]> | 2016-04-22 16:57:38 -0700 |
| commit | 86cd9a134f8d6db5c65268f4ca89a919be17689b (patch) | |
| tree | f46dfe39e7c78c4012e6760da881ce2e5322f69a | |
| parent | ec089cd987212566da146f0ddaf11dc28efec7ad (diff) | |
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 <[email protected]>
Acked-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_surface_formats.c | 6 | ||||
| -rw-r--r-- | 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 aa8a0a12fa5..c65f0d35235 100644 --- 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 6a20bd6d925..907f24f244d 100644 --- 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; } |