summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-08-23 14:11:18 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-08-23 16:51:34 -0700
commit70bc891c42085c7344a70e366d5262533d5c529b (patch)
treeacf1b4d6f44c26e61876bd14756fa61c308d4a8c
parent361678edd776ca3012cbe231167e740f7af9c0b0 (diff)
isl/formats: Integer formats are not filterable
In ca2a8e56285, we updated the format table to add more formats (most of which are new on SKL) but accidentally marked some integer formats as filterable. You can't filter an integer format. Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
-rw-r--r--src/intel/isl/isl_format.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index bced4ff231a..8507cc58f9a 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -237,10 +237,10 @@ static const struct surface_format_info format_info[] = {
SF(45, 45, x, x, x, x, x, x, x, x, P4A4_UNORM_PALETTE1)
SF(45, 45, x, x, x, x, x, x, x, x, A4P4_UNORM_PALETTE1)
SF( x, x, x, x, x, x, x, x, x, x, Y8_UNORM)
- SF(90, 90, x, x, x, x, x, x, x, x, L8_UINT)
- SF(90, 90, x, x, x, x, x, x, x, x, L8_SINT)
- SF(90, 90, x, x, x, x, x, x, x, x, I8_UINT)
- SF(90, 90, x, x, x, x, x, x, x, x, I8_SINT)
+ SF(90, x, x, x, x, x, x, x, x, x, L8_UINT)
+ SF(90, x, x, x, x, x, x, x, x, x, L8_SINT)
+ SF(90, x, x, x, x, x, x, x, x, x, I8_UINT)
+ SF(90, x, x, x, x, x, x, x, x, x, I8_SINT)
SF(45, 45, x, x, x, x, x, x, x, x, DXT1_RGB_SRGB)
SF( Y, Y, x, x, x, x, x, x, x, x, R1_UNORM)
SF( Y, Y, x, Y, Y, x, x, x, 60, x, YCRCB_NORMAL)
@@ -287,8 +287,8 @@ static const struct surface_format_info format_info[] = {
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(90, 90, x, x, x, x, 75, x, x, x, R16G16B16_UINT)
- SF(90, 90, x, x, x, x, 75, x, x, x, R16G16B16_SINT)
+ SF(90, x, x, x, x, x, 75, x, x, x, R16G16B16_UINT)
+ SF(90, 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)
@@ -305,8 +305,8 @@ static const struct surface_format_info format_info[] = {
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(90, 90, x, x, x, x, 75, x, x, x, R8G8B8_UINT)
- SF(90, 90, x, x, x, x, 75, x, x, x, R8G8B8_SINT)
+ SF(90, x, x, x, x, x, 75, x, x, x, R8G8B8_UINT)
+ SF(90, 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)