From ab3d8d5ea43501d7f0716e889e0ade505aaf9463 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 19 May 2016 15:43:43 -0700 Subject: [PATCH] i965/surface_formats: Update the VB column for new formats added on BYT Bay Trail and Haswell added a bunch of new vertex formats. There was also the addition of 64-bit passthrough formats for BDW+. Reviewed-by: Kenneth Graunke --- .../drivers/dri/i965/brw_surface_formats.c | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_surface_formats.c b/src/mesa/drivers/dri/i965/brw_surface_formats.c index 8592c3bbbc4..b6d710bfb71 100644 --- a/src/mesa/drivers/dri/i965/brw_surface_formats.c +++ b/src/mesa/drivers/dri/i965/brw_surface_formats.c @@ -83,7 +83,7 @@ const struct brw_surface_format_info surface_formats[] = { SF( Y, 50, x, x, x, x, x, x, x, x, R32G32B32X32_FLOAT) SF( x, x, x, x, x, x, Y, x, x, x, R32G32B32A32_SSCALED) SF( x, x, x, x, x, x, Y, x, x, x, R32G32B32A32_USCALED) - SF( x, x, x, x, x, x, x, x, x, x, R32G32B32A32_SFIXED) + SF( x, x, x, x, x, x, 75, x, x, x, R32G32B32A32_SFIXED) SF( x, x, x, x, x, x, x, x, x, x, R64G64_PASSTHRU) SF( Y, 50, x, x, x, x, Y, Y, x, x, R32G32B32_FLOAT) SF( Y, x, x, x, x, x, Y, Y, x, x, R32G32B32_SINT) @@ -92,7 +92,7 @@ const struct brw_surface_format_info surface_formats[] = { SF( x, x, x, x, x, x, Y, x, x, x, R32G32B32_SNORM) SF( x, x, x, x, x, x, Y, x, x, x, R32G32B32_SSCALED) SF( x, x, x, x, x, x, Y, x, x, x, R32G32B32_USCALED) - SF( x, x, x, x, x, x, x, x, x, x, R32G32B32_SFIXED) + SF( x, x, x, x, x, x, 75, x, x, x, R32G32B32_SFIXED) SF( Y, Y, x, x, Y, 45, Y, x, 60, 90, R16G16B16A16_UNORM) SF( Y, Y, x, x, Y, 60, Y, x, x, 90, R16G16B16A16_SNORM) SF( Y, x, x, x, Y, x, Y, x, x, 90, R16G16B16A16_SINT) @@ -117,7 +117,7 @@ const struct brw_surface_format_info surface_formats[] = { SF( x, x, x, x, x, x, Y, x, x, x, R16G16B16A16_USCALED) SF( x, x, x, x, x, x, Y, x, x, x, R32G32_SSCALED) SF( x, x, x, x, x, x, Y, x, x, x, R32G32_USCALED) - SF( x, x, x, x, x, x, x, x, x, x, R32G32_SFIXED) + SF( x, x, x, x, x, x, 75, x, x, x, R32G32_SFIXED) SF( x, x, x, x, x, x, x, x, x, x, R64_PASSTHRU) SF( Y, Y, x, Y, Y, Y, Y, x, 60, 90, B8G8R8A8_UNORM) SF( Y, Y, x, x, Y, Y, x, x, x, x, B8G8R8A8_UNORM_SRGB) @@ -136,7 +136,7 @@ const struct brw_surface_format_info surface_formats[] = { SF( Y, x, x, x, Y, x, Y, x, x, 90, R16G16_SINT) SF( Y, x, x, x, Y, x, Y, x, x, 90, R16G16_UINT) SF( Y, Y, x, x, Y, Y, Y, x, x, 90, R16G16_FLOAT) - SF( Y, Y, x, x, Y, Y, x, x, 60, x, B10G10R10A2_UNORM) + SF( Y, Y, x, x, Y, Y, 75, x, 60, x, B10G10R10A2_UNORM) SF( Y, Y, x, x, Y, Y, x, x, 60, x, B10G10R10A2_UNORM_SRGB) SF( Y, Y, x, x, Y, Y, Y, x, x, x, R11G11B10_FLOAT) SF( Y, x, x, x, Y, x, Y, Y, x, 90, R32_SINT) @@ -274,26 +274,26 @@ const struct brw_surface_format_info surface_formats[] = { SF(80, 80, x, x, x, x, x, x, x, x, EAC_SIGNED_R11) SF(80, 80, x, x, x, x, x, x, x, x, EAC_SIGNED_RG11) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_SRGB8) - SF( x, x, x, x, x, x, x, x, x, x, R16G16B16_UINT) - SF( x, x, x, x, x, x, x, x, x, x, R16G16B16_SINT) - SF( x, x, x, x, x, x, x, x, x, x, R32_SFIXED) - SF( x, x, x, x, x, x, x, x, x, x, R10G10B10A2_SNORM) - SF( x, x, x, x, x, x, x, x, x, x, R10G10B10A2_USCALED) - SF( x, x, x, x, x, x, x, x, x, x, R10G10B10A2_SSCALED) - SF( x, x, x, x, x, x, x, x, x, x, R10G10B10A2_SINT) - SF( x, x, x, x, x, x, x, x, x, x, B10G10R10A2_SNORM) - SF( x, x, x, x, x, x, x, x, x, x, B10G10R10A2_USCALED) - SF( x, x, x, x, x, x, x, x, x, x, B10G10R10A2_SSCALED) - SF( x, x, x, x, x, x, x, x, x, x, B10G10R10A2_UINT) - SF( x, x, x, x, x, x, x, x, x, x, B10G10R10A2_SINT) - SF( x, x, x, x, x, x, x, x, x, x, R64G64B64A64_PASSTHRU) - SF( x, x, x, x, x, x, x, x, x, x, R64G64B64_PASSTHRU) + SF( x, x, x, x, x, x, 75, x, x, x, R16G16B16_UINT) + SF( x, x, x, x, x, x, 75, x, x, x, R16G16B16_SINT) + SF( x, x, x, x, x, x, 75, x, x, x, R32_SFIXED) + SF( x, x, x, x, x, x, 75, x, x, x, R10G10B10A2_SNORM) + SF( x, x, x, x, x, x, 75, x, x, x, R10G10B10A2_USCALED) + SF( x, x, x, x, x, x, 75, x, x, x, R10G10B10A2_SSCALED) + SF( x, x, x, x, x, x, 75, x, x, x, R10G10B10A2_SINT) + SF( x, x, x, x, x, x, 75, x, x, x, B10G10R10A2_SNORM) + SF( x, x, x, x, x, x, 75, x, x, x, B10G10R10A2_USCALED) + SF( x, x, x, x, x, x, 75, x, x, x, B10G10R10A2_SSCALED) + SF( x, x, x, x, x, x, 75, x, x, x, B10G10R10A2_UINT) + SF( x, x, x, x, x, x, 75, x, x, x, B10G10R10A2_SINT) + SF( x, x, x, x, x, x, 80, x, x, x, R64G64B64A64_PASSTHRU) + SF( x, x, x, x, x, x, 80, x, x, x, R64G64B64_PASSTHRU) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_RGB8_PTA) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_SRGB8_PTA) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_EAC_RGBA8) SF(80, 80, x, x, x, x, x, x, x, x, ETC2_EAC_SRGB8_A8) - SF( x, x, x, x, x, x, x, x, x, x, R8G8B8_UINT) - SF( x, x, x, x, x, x, x, x, x, x, R8G8B8_SINT) + SF( x, x, x, x, x, x, 75, x, x, x, R8G8B8_UINT) + SF( x, x, x, x, x, x, 75, x, x, x, R8G8B8_SINT) SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_4x4_FLT16) SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5x4_FLT16) SF(80, 80, x, x, x, x, x, x, x, x, ASTC_LDR_2D_5x5_FLT16) -- 2.30.2