From bc8e7ea286fbe5dd61a5457ede186e808bf3fa2a Mon Sep 17 00:00:00 2001 From: Bryan Bernhart Date: Tue, 8 Oct 2019 07:46:51 +0000 Subject: [PATCH] Fix MSVC build error due to implicit descriptor heap offset cast. BUG=dawn:233 Change-Id: Ia42d7e99df910f245b7c78be16b7916c0730e8a9 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/11960 Reviewed-by: Austin Eng Reviewed-by: Corentin Wallez Commit-Queue: Corentin Wallez --- src/dawn_native/d3d12/DescriptorHeapAllocator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp b/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp index 29ccab7ddb..a69641a152 100644 --- a/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp +++ b/src/dawn_native/d3d12/DescriptorHeapAllocator.cpp @@ -72,7 +72,8 @@ namespace dawn_native { namespace d3d12 { ? RingBufferAllocator::kInvalidOffset : heapInfo->allocator.Allocate(count, pendingSerial); if (startOffset != RingBufferAllocator::kInvalidOffset) { - return DescriptorHeapHandle{heapInfo->heap, mSizeIncrements[type], startOffset}; + return DescriptorHeapHandle{heapInfo->heap, mSizeIncrements[type], + static_cast(startOffset)}; } // If the pool has no more space, replace the pool with a new one of the specified size