Merge pull request #85 from nickbabcock/b5g5r5a1

nickbabcock · web-flow · commit e5c338c4ffdf · 2022-01-01T21:29:48.000-06:00
Support B5G5R5A1_UNORM DDS images
diff --git a/src/Pfim/dds/DdsHeaderDxt10.cs b/src/Pfim/dds/DdsHeaderDxt10.cs
@@ -88,6 +88,9 @@ internal Dds NewDecoder(DdsHeader header, PfimConfig config)
                 case DxgiFormat.B8G8R8X8_UNORM_SRGB:
                     return new UncompressedDds(header, config, 32, false);
 
+                case DxgiFormat.B5G5R5A1_UNORM:
+                    return new UncompressedDds(header, config, 16, false);
+
                 case DxgiFormat.UNKNOWN:
                 case DxgiFormat.R32G32B32A32_TYPELESS:
                 case DxgiFormat.R32G32B32A32_FLOAT:
@@ -172,7 +175,7 @@ internal Dds NewDecoder(DdsHeader header, PfimConfig config)
                 case DxgiFormat.V208:
                 case DxgiFormat.V408:
                 default:
-                    throw new ArgumentOutOfRangeException($"Unimplemented DXGI format: {DxgiFormat}");
+                    throw new ArgumentException($"Unimplemented DXGI format: {DxgiFormat}");
             }
         }
     }
diff --git a/tests/Pfim.Tests/ImageTests.cs b/tests/Pfim.Tests/ImageTests.cs
@@ -15,6 +15,7 @@ public class ImageTests
         [InlineData("32-bit-uncompressed.dds", 8563937048591661181, ImageFormat.Rgba32)]
         [InlineData("Antenna_Metal_0_Normal.dds", 11008763962346865605, ImageFormat.Rgb24)]
         [InlineData("b8g8r8x8.dds", 14954708280773054506, ImageFormat.Rgba32)]
+        [InlineData("b5g5r5a1.dds", 10104226901531980508, ImageFormat.R5g5b5a1)]
         [InlineData("CBW8.tga", 11906269729452326966, ImageFormat.Rgb8)]
         [InlineData("CCM8.tga", 11437704396291630213, ImageFormat.R5g5b5)]
         [InlineData("CTC16.tga", 11437704396291630213, ImageFormat.R5g5b5)]
diff --git a/tests/Pfim.Tests/data/b5g5r5a1.dds b/tests/Pfim.Tests/data/b5g5r5a1.dds

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ internal Dds NewDecoder(DdsHeader header, PfimConfig config)`
`88`	`88`	`case DxgiFormat.B8G8R8X8_UNORM_SRGB:`
`89`	`89`	`return new UncompressedDds(header, config, 32, false);`
`90`	`90`
	`91`	`+ case DxgiFormat.B5G5R5A1_UNORM:`
	`92`	`+ return new UncompressedDds(header, config, 16, false);`
	`93`	`+`
`91`	`94`	`case DxgiFormat.UNKNOWN:`
`92`	`95`	`case DxgiFormat.R32G32B32A32_TYPELESS:`
`93`	`96`	`case DxgiFormat.R32G32B32A32_FLOAT:`
`@@ -172,7 +175,7 @@ internal Dds NewDecoder(DdsHeader header, PfimConfig config)`
`172`	`175`	`case DxgiFormat.V208:`
`173`	`176`	`case DxgiFormat.V408:`
`174`	`177`	`default:`
`175`		`- throw new ArgumentOutOfRangeException($"Unimplemented DXGI format: {DxgiFormat}");`
	`178`	`+ throw new ArgumentException($"Unimplemented DXGI format: {DxgiFormat}");`
`176`	`179`	`}`
`177`	`180`	`}`
`178`	`181`	`}`