summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/v3d/v3dx_format_table.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 5676bd537c9..e25caf2e3db 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -31,7 +31,7 @@
"description": "v3d: Fix swizzle in DXT3 and DXT5 formats",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "469bbd8387d11bbac2aae4c49765c748c2a9fd04"
},
diff --git a/src/gallium/drivers/v3d/v3dx_format_table.c b/src/gallium/drivers/v3d/v3dx_format_table.c
index dd5648fcd70..535803aabb7 100644
--- a/src/gallium/drivers/v3d/v3dx_format_table.c
+++ b/src/gallium/drivers/v3d/v3dx_format_table.c
@@ -177,8 +177,8 @@ static const struct v3d_format format_table[] = {
FORMAT(ETC2_RG11_SNORM, NO, SIGNED_RG11_EAC, SWIZ_XY01, 16, 0),
FORMAT(DXT1_RGB, NO, BC1, SWIZ_XYZ1, 16, 0),
- FORMAT(DXT3_RGBA, NO, BC2, SWIZ_XYZ1, 16, 0),
- FORMAT(DXT5_RGBA, NO, BC3, SWIZ_XYZ1, 16, 0),
+ FORMAT(DXT3_RGBA, NO, BC2, SWIZ_XYZW, 16, 0),
+ FORMAT(DXT5_RGBA, NO, BC3, SWIZ_XYZW, 16, 0),
};
const struct v3d_format *