[Mesa-dev] [PATCH 2/2] intel: Choose MESA_FORMAT_SIGNED_{R16, GR1616} for ETC2 signed-{r11, rg11} formats

[Kenneth Graunke]

On 11/15/2012 12:17 PM, Anuj Phogat wrote:
> This fix makes both signed format tests in gles3 conformance pass.
>
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>   src/mesa/drivers/dri/intel/intel_mipmap_tree.c |    8 ++++++--
>   1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
> index 2f32f77..881cb27 100644
> --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
> @@ -220,13 +220,17 @@ intel_miptree_create(struct intel_context *intel,
>         format = MESA_FORMAT_RGBA8888_REV;
>         break;
>      case MESA_FORMAT_ETC2_R11_EAC:
> -   case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
>         format = MESA_FORMAT_R16;
>         break;
> +   case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
> +      format = MESA_FORMAT_SIGNED_R16;
> +      break;
>      case MESA_FORMAT_ETC2_RG11_EAC:
> -   case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
>         format = MESA_FORMAT_RG1616;
>         break;
> +   case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
> +      format = MESA_FORMAT_SIGNED_GR1616;
> +      break;
>      default:
>         /* Non ETC1 / ETC2 format */
>         break;

Patch 2 is:
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

(I don't plan on reviewing patch 1.)