Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 18 deletions

diff --git a/third_party/rust/wgpu-core/src/hub.rs b/third_party/rust/wgpu-core/src/hub.rs
index 0f4589c8b3..eb57411d98 100644
--- a/third_party/rust/wgpu-core/src/hub.rs
+++ b/third_party/rust/wgpu-core/src/hub.rs
@@ -169,23 +169,23 @@ impl HubReport {
 ///
 /// [`A::hub(global)`]: HalApi::hub
 pub struct Hub<A: HalApi> {
-    pub adapters: Registry<Adapter<A>>,
-    pub devices: Registry<Device<A>>,
-    pub queues: Registry<Queue<A>>,
-    pub pipeline_layouts: Registry<PipelineLayout<A>>,
-    pub shader_modules: Registry<ShaderModule<A>>,
-    pub bind_group_layouts: Registry<BindGroupLayout<A>>,
-    pub bind_groups: Registry<BindGroup<A>>,
-    pub command_buffers: Registry<CommandBuffer<A>>,
-    pub render_bundles: Registry<RenderBundle<A>>,
-    pub render_pipelines: Registry<RenderPipeline<A>>,
-    pub compute_pipelines: Registry<ComputePipeline<A>>,
-    pub query_sets: Registry<QuerySet<A>>,
-    pub buffers: Registry<Buffer<A>>,
-    pub staging_buffers: Registry<StagingBuffer<A>>,
-    pub textures: Registry<Texture<A>>,
-    pub texture_views: Registry<TextureView<A>>,
-    pub samplers: Registry<Sampler<A>>,
+    pub(crate) adapters: Registry<Adapter<A>>,
+    pub(crate) devices: Registry<Device<A>>,
+    pub(crate) queues: Registry<Queue<A>>,
+    pub(crate) pipeline_layouts: Registry<PipelineLayout<A>>,
+    pub(crate) shader_modules: Registry<ShaderModule<A>>,
+    pub(crate) bind_group_layouts: Registry<BindGroupLayout<A>>,
+    pub(crate) bind_groups: Registry<BindGroup<A>>,
+    pub(crate) command_buffers: Registry<CommandBuffer<A>>,
+    pub(crate) render_bundles: Registry<RenderBundle<A>>,
+    pub(crate) render_pipelines: Registry<RenderPipeline<A>>,
+    pub(crate) compute_pipelines: Registry<ComputePipeline<A>>,
+    pub(crate) query_sets: Registry<QuerySet<A>>,
+    pub(crate) buffers: Registry<Buffer<A>>,
+    pub(crate) staging_buffers: Registry<StagingBuffer<A>>,
+    pub(crate) textures: Registry<Texture<A>>,
+    pub(crate) texture_views: Registry<TextureView<A>>,
+    pub(crate) samplers: Registry<Sampler<A>>,
 }
 
 impl<A: HalApi> Hub<A> {
@@ -241,7 +241,7 @@ impl<A: HalApi> Hub<A> {
             if let Element::Occupied(ref surface, _epoch) = *element {
                 if let Some(ref mut present) = surface.presentation.lock().take() {
                     if let Some(device) = present.device.downcast_ref::<A>() {
-                        let suf = A::get_surface(surface);
+                        let suf = A::surface_as_hal(surface);
                         unsafe {
                             suf.unwrap().unconfigure(device.raw());
                             //TODO: we could destroy the surface here