From: Kenneth Graunke Date: Wed, 4 Jul 2018 23:11:01 +0000 (-0700) Subject: iris: comment out l/a/i/la X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0232fbc2c42ce89aa5796222aa4bc664ab0a9e31;p=mesa.git iris: comment out l/a/i/la in hopes of r/rg fallbacks --- diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c index 374b80ce17b..51134a5be64 100644 --- a/src/gallium/drivers/iris/iris_formats.c +++ b/src/gallium/drivers/iris/iris_formats.c @@ -41,11 +41,11 @@ iris_isl_format_for_pipe_format(enum pipe_format pf) [PIPE_FORMAT_B4G4R4A4_UNORM] = ISL_FORMAT_B4G4R4A4_UNORM, [PIPE_FORMAT_B5G6R5_UNORM] = ISL_FORMAT_B5G6R5_UNORM, [PIPE_FORMAT_R10G10B10A2_UNORM] = ISL_FORMAT_R10G10B10A2_UNORM, - [PIPE_FORMAT_L8_UNORM] = ISL_FORMAT_L8_UNORM, - [PIPE_FORMAT_A8_UNORM] = ISL_FORMAT_A8_UNORM, - [PIPE_FORMAT_I8_UNORM] = ISL_FORMAT_I8_UNORM, - [PIPE_FORMAT_L8A8_UNORM] = ISL_FORMAT_L8A8_UNORM, - [PIPE_FORMAT_L16_UNORM] = ISL_FORMAT_L16_UNORM, + //[PIPE_FORMAT_L8_UNORM] = ISL_FORMAT_L8_UNORM, + //[PIPE_FORMAT_A8_UNORM] = ISL_FORMAT_A8_UNORM, + //[PIPE_FORMAT_I8_UNORM] = ISL_FORMAT_I8_UNORM, + //[PIPE_FORMAT_L8A8_UNORM] = ISL_FORMAT_L8A8_UNORM, + //[PIPE_FORMAT_L16_UNORM] = ISL_FORMAT_L16_UNORM, //[PIPE_FORMAT_UYVY] = ISL_FORMAT_UYVY, //[PIPE_FORMAT_YUYV] = ISL_FORMAT_YUYV, [PIPE_FORMAT_Z16_UNORM] = ISL_FORMAT_R16_UNORM, @@ -123,8 +123,8 @@ iris_isl_format_for_pipe_format(enum pipe_format pf) [PIPE_FORMAT_R16G16B16_FLOAT] = ISL_FORMAT_R16G16B16_FLOAT, [PIPE_FORMAT_R16G16B16A16_FLOAT] = ISL_FORMAT_R16G16B16A16_FLOAT, - [PIPE_FORMAT_L8_SRGB] = ISL_FORMAT_L8_UNORM_SRGB, - [PIPE_FORMAT_L8A8_SRGB] = ISL_FORMAT_L8A8_UNORM_SRGB, + //[PIPE_FORMAT_L8_SRGB] = ISL_FORMAT_L8_UNORM_SRGB, + //[PIPE_FORMAT_L8A8_SRGB] = ISL_FORMAT_L8A8_UNORM_SRGB, [PIPE_FORMAT_R8G8B8_SRGB] = ISL_FORMAT_R8G8B8_UNORM_SRGB, //[PIPE_FORMAT_A8B8G8R8_SRGB] = ISL_FORMAT_A8B8G8R8_UNORM_SRGB, //[PIPE_FORMAT_X8B8G8R8_SRGB] = ISL_FORMAT_X8B8G8R8_UNORM_SRGB, @@ -177,32 +177,32 @@ iris_isl_format_for_pipe_format(enum pipe_format pf) //[PIPE_FORMAT_X32_S8X24_UINT] = ISL_FORMAT_X32_S8X24_UINT, //[PIPE_FORMAT_B2G3R3_UNORM] = ISL_FORMAT_B2G3R3_UNORM, - [PIPE_FORMAT_L16A16_UNORM] = ISL_FORMAT_R16G16_UNORM, - [PIPE_FORMAT_A16_UNORM] = ISL_FORMAT_R16_UNORM, - [PIPE_FORMAT_I16_UNORM] = ISL_FORMAT_R16_UNORM, + //[PIPE_FORMAT_L16A16_UNORM] = ISL_FORMAT_R16G16_UNORM, + //[PIPE_FORMAT_A16_UNORM] = ISL_FORMAT_R16_UNORM, + //[PIPE_FORMAT_I16_UNORM] = ISL_FORMAT_R16_UNORM, //[PIPE_FORMAT_LATC1_UNORM] = ISL_FORMAT_LATC1_UNORM, //[PIPE_FORMAT_LATC1_SNORM] = ISL_FORMAT_LATC1_SNORM, //[PIPE_FORMAT_LATC2_UNORM] = ISL_FORMAT_LATC2_UNORM, //[PIPE_FORMAT_LATC2_SNORM] = ISL_FORMAT_LATC2_SNORM, - [PIPE_FORMAT_A8_SNORM] = ISL_FORMAT_R8_SNORM, - [PIPE_FORMAT_L8_SNORM] = ISL_FORMAT_R8_SNORM, - [PIPE_FORMAT_L8A8_SNORM] = ISL_FORMAT_R8G8_SNORM, - [PIPE_FORMAT_I8_SNORM] = ISL_FORMAT_R8_SNORM, - [PIPE_FORMAT_A16_SNORM] = ISL_FORMAT_R16_SNORM, - [PIPE_FORMAT_L16_SNORM] = ISL_FORMAT_R16_SNORM, - [PIPE_FORMAT_L16A16_SNORM] = ISL_FORMAT_R16G16_SNORM, - [PIPE_FORMAT_I16_SNORM] = ISL_FORMAT_R16_SNORM, - - [PIPE_FORMAT_A16_FLOAT] = ISL_FORMAT_R16_FLOAT, - [PIPE_FORMAT_L16_FLOAT] = ISL_FORMAT_R16_FLOAT, - [PIPE_FORMAT_L16A16_FLOAT] = ISL_FORMAT_R16G16_FLOAT, - [PIPE_FORMAT_I16_FLOAT] = ISL_FORMAT_R16_FLOAT, - [PIPE_FORMAT_A32_FLOAT] = ISL_FORMAT_R32_FLOAT, - [PIPE_FORMAT_L32_FLOAT] = ISL_FORMAT_R32_FLOAT, - [PIPE_FORMAT_L32A32_FLOAT] = ISL_FORMAT_R32G32_FLOAT, - [PIPE_FORMAT_I32_FLOAT] = ISL_FORMAT_R32_FLOAT, + //[PIPE_FORMAT_A8_SNORM] = ISL_FORMAT_R8_SNORM, + //[PIPE_FORMAT_L8_SNORM] = ISL_FORMAT_R8_SNORM, + //[PIPE_FORMAT_L8A8_SNORM] = ISL_FORMAT_R8G8_SNORM, + //[PIPE_FORMAT_I8_SNORM] = ISL_FORMAT_R8_SNORM, + //[PIPE_FORMAT_A16_SNORM] = ISL_FORMAT_R16_SNORM, + //[PIPE_FORMAT_L16_SNORM] = ISL_FORMAT_R16_SNORM, + //[PIPE_FORMAT_L16A16_SNORM] = ISL_FORMAT_R16G16_SNORM, + //[PIPE_FORMAT_I16_SNORM] = ISL_FORMAT_R16_SNORM, + + //[PIPE_FORMAT_A16_FLOAT] = ISL_FORMAT_R16_FLOAT, + //[PIPE_FORMAT_L16_FLOAT] = ISL_FORMAT_R16_FLOAT, + //[PIPE_FORMAT_L16A16_FLOAT] = ISL_FORMAT_R16G16_FLOAT, + //[PIPE_FORMAT_I16_FLOAT] = ISL_FORMAT_R16_FLOAT, + //[PIPE_FORMAT_A32_FLOAT] = ISL_FORMAT_R32_FLOAT, + //[PIPE_FORMAT_L32_FLOAT] = ISL_FORMAT_R32_FLOAT, + //[PIPE_FORMAT_L32A32_FLOAT] = ISL_FORMAT_R32G32_FLOAT, + //[PIPE_FORMAT_I32_FLOAT] = ISL_FORMAT_R32_FLOAT, //[PIPE_FORMAT_YV12] = ISL_FORMAT_YV12, //[PIPE_FORMAT_YV16] = ISL_FORMAT_YV16, @@ -252,6 +252,7 @@ iris_isl_format_for_pipe_format(enum pipe_format pf) [PIPE_FORMAT_R32G32B32_SINT] = ISL_FORMAT_R32G32B32_SINT, [PIPE_FORMAT_R32G32B32A32_SINT] = ISL_FORMAT_R32G32B32A32_SINT, + /* [PIPE_FORMAT_A8_UINT] = ISL_FORMAT_R8_UINT, [PIPE_FORMAT_I8_UINT] = ISL_FORMAT_R8_UINT, [PIPE_FORMAT_L8_UINT] = ISL_FORMAT_R8_UINT, @@ -281,6 +282,7 @@ iris_isl_format_for_pipe_format(enum pipe_format pf) [PIPE_FORMAT_I32_SINT] = ISL_FORMAT_R32_SINT, [PIPE_FORMAT_L32_SINT] = ISL_FORMAT_R32_SINT, [PIPE_FORMAT_L32A32_SINT] = ISL_FORMAT_R32G32_SINT, + */ [PIPE_FORMAT_B10G10R10A2_UINT] = ISL_FORMAT_B10G10R10A2_UINT,