From 46831a8b25751d687ce049ccdaec52576bb991bc Mon Sep 17 00:00:00 2001
From: Andreas Reich <andreas@rerun.io>
Date: Mon, 19 Dec 2022 15:40:47 +0100
Subject: [PATCH] deref/deref_mut methods on buffer-views inline (#3307)

* mark deref/deref_mut methods on buffer-views inline

* inline for deref for both direct/web backend

* changelog entry
---
 CHANGELOG.md               | 1 +
 wgpu/src/backend/direct.rs | 3 +++
 wgpu/src/backend/web.rs    | 3 +++
 wgpu/src/lib.rs            | 6 ++++++
 4 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98d7be13c2..70c2c791a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -114,6 +114,7 @@ Additionally `Surface::get_default_config` now returns an Option and returns Non
 - Combine `Surface::get_supported_formats`, `Surface::get_supported_present_modes`, and `Surface::get_supported_alpha_modes` into `Surface::get_capabilities` and `SurfaceCapabilities`. By @cwfitzgerald in [#3157](https://github.com/gfx-rs/wgpu/pull/3157)
 - Make `Surface::get_default_config` return an Option to prevent panics. By @cwfitzgerald in [#3157](https://github.com/gfx-rs/wgpu/pull/3157)
 - Lower the `max_buffer_size` limit value for compatibility with Apple2 and WebGPU compliance. By @jinleili in [#3255](https://github.com/gfx-rs/wgpu/pull/3255)
+- Dereferencing a buffer view is now marked inline. By @Wumpf in [#3307](https://github.com/gfx-rs/wgpu/pull/3307)
 
 #### WebGPU
 
diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs
index 6187bedb06..8474c35f53 100644
--- a/wgpu/src/backend/direct.rs
+++ b/wgpu/src/backend/direct.rs
@@ -2501,6 +2501,7 @@ impl std::ops::Deref for QueueWriteBuffer {
 }
 
 impl std::ops::DerefMut for QueueWriteBuffer {
+    #[inline]
     fn deref_mut(&mut self) -> &mut Self::Target {
         use crate::BufferMappedRangeSlice;
         self.mapping.slice_mut()
@@ -2517,10 +2518,12 @@ unsafe impl Send for BufferMappedRange {}
 unsafe impl Sync for BufferMappedRange {}
 
 impl crate::BufferMappedRangeSlice for BufferMappedRange {
+    #[inline]
     fn slice(&self) -> &[u8] {
         unsafe { slice::from_raw_parts(self.ptr, self.size) }
     }
 
+    #[inline]
     fn slice_mut(&mut self) -> &mut [u8] {
         unsafe { slice::from_raw_parts_mut(self.ptr, self.size) }
     }
diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs
index a8fc828815..03640b966f 100644
--- a/wgpu/src/backend/web.rs
+++ b/wgpu/src/backend/web.rs
@@ -2530,6 +2530,7 @@ impl std::ops::Deref for QueueWriteBuffer {
 }
 
 impl std::ops::DerefMut for QueueWriteBuffer {
+    #[inline]
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.0
     }
@@ -2542,10 +2543,12 @@ pub struct BufferMappedRange {
 }
 
 impl crate::BufferMappedRangeSlice for BufferMappedRange {
+    #[inline]
     fn slice(&self) -> &[u8] {
         &self.temporary_mapping
     }
 
+    #[inline]
     fn slice_mut(&mut self) -> &mut [u8] {
         &mut self.temporary_mapping
     }
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 126471e9b9..fe1f34e44c 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -2508,6 +2508,7 @@ pub struct BufferViewMut<'a> {
 impl std::ops::Deref for BufferView<'_> {
     type Target = [u8];
 
+    #[inline]
     fn deref(&self) -> &[u8] {
         self.data.slice()
     }
@@ -2516,6 +2517,7 @@ impl std::ops::Deref for BufferView<'_> {
 impl std::ops::Deref for BufferViewMut<'_> {
     type Target = [u8];
 
+    #[inline]
     fn deref(&self) -> &[u8] {
         assert!(
             self.readable,
@@ -2527,18 +2529,21 @@ impl std::ops::Deref for BufferViewMut<'_> {
 }
 
 impl std::ops::DerefMut for BufferViewMut<'_> {
+    #[inline]
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.data.slice_mut()
     }
 }
 
 impl AsRef<[u8]> for BufferView<'_> {
+    #[inline]
     fn as_ref(&self) -> &[u8] {
         self.data.slice()
     }
 }
 
 impl AsMut<[u8]> for BufferViewMut<'_> {
+    #[inline]
     fn as_mut(&mut self) -> &mut [u8] {
         self.data.slice_mut()
     }
@@ -3608,6 +3613,7 @@ impl<'a> std::ops::Deref for QueueWriteBufferView<'a> {
 }
 
 impl<'a> std::ops::DerefMut for QueueWriteBufferView<'a> {
+    #[inline]
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.inner
     }