Merge #785

785: Update to latest web-sys bindings r=kvark a=grovesNL We can wait for rustwasm/wasm-bindgen#2482 first Co-authored-by: Joshua Groves <josh@joshgroves.com>
gfx-rs · Mar 23, 2021 · 1aeb1e5 · 1aeb1e5
2 parents 4d5072b + c532a54
commit 1aeb1e5
Show file tree

Hide file tree

Showing 3 changed files with 420 additions and 279 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -28,7 +28,7 @@ jobs:
         run: cargo build --release --target wasm32-unknown-unknown --examples
 
       - name: Install wasm-bindgen-cli
-        run: cargo install --force wasm-bindgen-cli --version 0.2.69
+        run: cargo install --force wasm-bindgen-cli --version 0.2.72
 
       - name: Generate JS bindings for the examples
         run: |

diff --git a/Cargo.toml b/Cargo.toml
@@ -107,103 +107,140 @@ test = true
 #gfx-backend-dx11 = { path = "../gfx/src/backend/dx11" }
 #gfx-backend-metal = { path = "../gfx/src/backend/metal" }
 
+[patch.crates-io]
+#web-sys = { path = "../wasm-bindgen/crates/web-sys" }
+#js-sys = { path = "../wasm-bindgen/crates/js-sys" }
+#wasm-bindgen = { path = "../wasm-bindgen" }
+
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bindgen = "=0.2.69" # remember to change version in readme as well
-web-sys = { version = "=0.3.46", features = [
+wasm-bindgen = "=0.2.72" # remember to change version in wiki as well
+web-sys = { version = "=0.3.49", features = [
     "Document",
     "Navigator",
     "Node",
     "NodeList",
     "Gpu",
     "GpuAdapter",
+    "GpuAdapterFeatures",
+    "GpuAdapterLimits",
     "GpuAddressMode",
     "GpuBindGroup",
-    "GpuBindGroupEntry",
     "GpuBindGroupDescriptor",
+    "GpuBindGroupEntry",
     "GpuBindGroupLayout",
-    "GpuBindGroupLayoutEntry",
     "GpuBindGroupLayoutDescriptor",
-    "GpuBlendDescriptor",
+    "GpuBindGroupLayoutEntry",
+    "GpuBlendComponent",
     "GpuBlendFactor",
     "GpuBlendOperation",
-    "GpuBindingType",
+    "GpuBlendState",
     "GpuBuffer",
     "GpuBufferBinding",
-    "GpuBufferCopyView",
+    "GpuBufferBindingLayout",
+    "GpuBufferBindingType",
     "GpuBufferDescriptor",
+    "GpuBufferUsage",
     "GpuCanvasContext",
     "GpuColorDict",
-    "GpuColorStateDescriptor",
+    "GpuColorTargetState",
+    "GpuColorWrite",
     "GpuCommandBuffer",
     "GpuCommandBufferDescriptor",
     "GpuCommandEncoder",
     "GpuCommandEncoderDescriptor",
     "GpuCompareFunction",
+    "GpuCompilationInfo",
+    "GpuCompilationMessage",
+    "GpuCompilationMessageType",
     "GpuComputePassDescriptor",
     "GpuComputePassEncoder",
     "GpuComputePipeline",
     "GpuComputePipelineDescriptor",
     "GpuCullMode",
-    "GpuDepthStencilStateDescriptor",
+    "GpuDepthStencilState",
     "GpuDevice",
     "GpuDeviceDescriptor",
+    "GpuDeviceLostInfo",
+    "GpuDeviceLostReason",
+    "GpuErrorFilter",
     "GpuExtent3dDict",
+    "GpuFeatureName",
     "GpuFilterMode",
+    "GpuFragmentState",
     "GpuFrontFace",
+    "GpuImageCopyBuffer",
+    "GpuImageCopyImageBitmap",
+    "GpuImageCopyTexture",
+    "GpuImageDataLayout",
     "GpuIndexFormat",
     "GpuInputStepMode",
-    "GpuLimits",
     "GpuLoadOp",
     "GpuMapMode",
+    "GpuMultisampleState",
+    "GpuObjectDescriptorBase",
+    "GpuOrigin2dDict",
     "GpuOrigin3dDict",
+    "GpuOutOfMemoryError",
+    "GpuPipelineDescriptorBase",
     "GpuPipelineLayout",
     "GpuPipelineLayoutDescriptor",
+    "GpuPipelineStatisticName",
     "GpuPowerPreference",
+    "GpuPrimitiveState",
     "GpuPrimitiveTopology",
-    "GpuProgrammableStageDescriptor",
+    "GpuProgrammableStage",
+    "GpuQuerySet",
+    "GpuQuerySetDescriptor",
+    "GpuQueryType",
     "GpuQueue",
-    "GpuRasterizationStateDescriptor",
     "GpuRenderBundle",
     "GpuRenderBundleDescriptor",
     "GpuRenderBundleEncoder",
     "GpuRenderBundleEncoderDescriptor",
-    "GpuRenderPassColorAttachmentDescriptor",
-    "GpuRenderPassDepthStencilAttachmentDescriptor",
+    "GpuRenderPassColorAttachment",
+    "GpuRenderPassDepthStencilAttachment",
     "GpuRenderPassDescriptor",
     "GpuRenderPassEncoder",
     "GpuRenderPipeline",
     "GpuRenderPipelineDescriptor",
     "GpuRequestAdapterOptions",
     "GpuSampler",
+    "GpuSamplerBindingLayout",
+    "GpuSamplerBindingType",
     "GpuSamplerDescriptor",
     "GpuShaderModule",
     "GpuShaderModuleDescriptor",
+    "GpuShaderStage",
+    "GpuStencilFaceState",
     "GpuStencilOperation",
-    "GpuStencilStateFaceDescriptor",
+    "GpuStorageTextureAccess",
+    "GpuStorageTextureBindingLayout",
     "GpuStoreOp",
     "GpuSwapChain",
     "GpuSwapChainDescriptor",
     "GpuTexture",
     "GpuTextureAspect",
-    "GpuTextureComponentType",
-    "GpuTextureCopyView",
-    "GpuTextureDataLayout",
+    "GpuTextureBindingLayout",
     "GpuTextureDescriptor",
     "GpuTextureDimension",
     "GpuTextureFormat",
+    "GpuTextureSampleType",
+    "GpuTextureUsage",
+    "GpuTextureView",
     "GpuTextureViewDescriptor",
     "GpuTextureViewDimension",
-    "GpuTextureView",
-    "GpuVertexAttributeDescriptor",
-    "GpuVertexBufferLayoutDescriptor",
+    "GpuUncapturedErrorEvent",
+    "GpuUncapturedErrorEventInit",
+    "GpuValidationError",
+    "GpuVertexAttribute",
+    "GpuVertexBufferLayout",
     "GpuVertexFormat",
-    "GpuVertexStateDescriptor",
-    "GpuVertexAttributeDescriptor",
+    "GpuVertexState",
     "HtmlCanvasElement",
     "Window",
 ]}
-js-sys = "0.3.46"
-wasm-bindgen-futures = "0.4.19"
+js-sys = "0.3.49"
+wasm-bindgen-futures = "0.4.22"
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 console_error_panic_hook = "0.1.6"