use custom ser/de impl for TextureFormat (#2908)

Co-authored-by: Alphyr <[email protected]>
gfx-rs · Sep 29, 2022 · 26f2239 · 26f2239
1 parent c927e81
commit 26f2239
Show file tree

Hide file tree

Showing 8 changed files with 841 additions and 87 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/player/tests/data/clear-buffer-texture.ron b/player/tests/data/clear-buffer-texture.ron
@@ -29,7 +29,7 @@
             mip_level_count: 1,
             sample_count: 1,
             dimension: r#2d,
-            format: rgba8unorm,
+            format: "rgba8unorm",
             usage: 27,
         )),
         // First fill the texture to ensure it wasn't just zero initialized or "happened" to be zero.

diff --git a/player/tests/data/quad.ron b/player/tests/data/quad.ron
@@ -26,7 +26,7 @@
             mip_level_count: 1,
             sample_count: 1,
             dimension: r#2d,
-            format: rgba8unorm,
+            format: "rgba8unorm",
             usage: 27,
         )),
         CreateTextureView(
@@ -67,7 +67,7 @@
                     ),
                     targets: [
                         Some((
-                            format: rgba8unorm,
+                            format: "rgba8unorm",
                         )),
                     ],
                 )),
@@ -129,4 +129,4 @@
             ),
         ]),
     ],
-)
+)
diff --git a/player/tests/data/zero-init-texture-binding.ron b/player/tests/data/zero-init-texture-binding.ron
@@ -26,7 +26,7 @@
             mip_level_count: 1,
             sample_count: 1,
             dimension: r#2d,
-            format: rgba8unorm,
+            format: "rgba8unorm",
             usage: 5, // SAMPLED + COPY_SRC
         )),
         CreateTextureView(
@@ -52,7 +52,7 @@
             mip_level_count: 1,
             sample_count: 1,
             dimension: r#2d,
-            format: rgba8unorm,
+            format: "rgba8unorm",
             usage: 9, // STORAGE + COPY_SRC
         )),
         CreateTextureView(
@@ -89,7 +89,7 @@
                     visibility: 4, // COMPUTE
                     ty: StorageTexture (
                         access: r#write-only,
-                        format: rgba8unorm,
+                        format: "rgba8unorm",
                         view_dimension: r#2d,
                     ),
                     count: None,
@@ -194,4 +194,4 @@
             ),
         ]),
     ],
-)
+)
diff --git a/player/tests/data/zero-init-texture-copytobuffer.ron b/player/tests/data/zero-init-texture-copytobuffer.ron
@@ -19,7 +19,7 @@
             mip_level_count: 1,
             sample_count: 1,
             dimension: r#2d,
-            format: rgba8unorm,
+            format: "rgba8unorm",
             usage: 1, // COPY_SRC
         )),
         CreateBuffer(
@@ -53,4 +53,4 @@
             ),
         ]),
     ],
-)
+)
diff --git a/player/tests/data/zero-init-texture-rendertarget.ron b/player/tests/data/zero-init-texture-rendertarget.ron
@@ -19,7 +19,7 @@
             mip_level_count: 1,
             sample_count: 1,
             dimension: r#2d,
-            format: rgba8unorm,
+            format: "rgba8unorm",
             usage: 17, // RENDER_ATTACHMENT + COPY_SRC
         )),
         CreateTextureView(
@@ -82,4 +82,4 @@
             ),
         ]),
     ],
-)
+)
diff --git a/wgpu-types/Cargo.toml b/wgpu-types/Cargo.toml
@@ -19,3 +19,6 @@ replay = ["serde", "bitflags_serde_shim"]
 bitflags = "1.0"
 serde = { version = "1.0", features = ["serde_derive"], optional = true }
 bitflags_serde_shim = { version = "0.2", optional = true }
+
+[dev-dependencies]
+serde_json = "1.0.85"