Fixes from code review of Metal3 argument buffers.

KhronosGroup · Jul 2, 2024 · bfb35bd · bfb35bd
1 parent a3908bf
commit bfb35bd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -30,7 +30,7 @@ Released TBD
 - Fix shader conversion failure when using native texture atomics.
 - MSL shader conversion, only pass resource bindings that apply to current shader stage.
 - Update documentation for minimum runtime OS requirements to indicate _macOS 10.15_, _iOS 13_, or _tvOS 13_.
-- Update `MVK_PRIVATE_API_VERSION` to version `43`.
+- Update `MVK_PRIVATE_API_VERSION` to version `42`.
 - Update to latest SPIRV-Cross:
  - MSL: Add option to force depth write in fragment shaders
  - MSL: Improve handling of padded descriptors with argument buffers

diff --git a/MoltenVK/MoltenVK/API/mvk_private_api.h b/MoltenVK/MoltenVK/API/mvk_private_api.h
@@ -44,7 +44,7 @@ typedef unsigned long MTLArgumentBuffersTier;
  */
 
 
-#define MVK_PRIVATE_API_VERSION 43
+#define MVK_PRIVATE_API_VERSION 42
 
 
 #pragma mark -

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.h b/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.h
@@ -399,7 +399,7 @@ class MVKInlineUniformBlockDescriptor : public MVKDescriptor {
  ~MVKInlineUniformBlockDescriptor() { reset(); }
 
 protected:
- inline uint8_t* getData() { return _mvkMTLBufferAllocation ? (uint8_t*)_mvkMTLBufferAllocation->getContents() : nullptr; }
+ uint8_t* getData() { return _mvkMTLBufferAllocation ? (uint8_t*)_mvkMTLBufferAllocation->getContents() : nullptr; }
 
  MVKMTLBufferAllocation* _mvkMTLBufferAllocation = nullptr;
 };