Tiny cleanup of GetMappedRange.
Fix the last TODOs for the deletion of the "old mapping".
Bug: dawn:445
Change-Id: Ie7443446e4696cf38801980db3d3cfdb09094578
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/27060
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/dawn_native/Buffer.cpp b/src/dawn_native/Buffer.cpp
index dcdfb9c..b2bd300 100644
--- a/src/dawn_native/Buffer.cpp
+++ b/src/dawn_native/Buffer.cpp
@@ -266,8 +266,6 @@
return GetMappedRangeInternal(false, offset, size);
}
- // TODO(dawn:445): When CreateBufferMapped is removed, make GetMappedRangeInternal also take
- // care of the validation of GetMappedRange.
void* BufferBase::GetMappedRangeInternal(bool writable, size_t offset, size_t size) {
if (!CanGetMappedRange(writable, offset, size)) {
return nullptr;
@@ -461,11 +459,9 @@
return true;
case BufferState::Mapped:
- // TODO(dawn:445): When mapRead/WriteAsync is removed, check against mMapMode
- // instead of mUsage
- ASSERT(bool(mUsage & wgpu::BufferUsage::MapRead) ^
- bool(mUsage & wgpu::BufferUsage::MapWrite));
- return !writable || (mUsage & wgpu::BufferUsage::MapWrite);
+ ASSERT(bool(mMapMode & wgpu::MapMode::Read) ^
+ bool(mMapMode & wgpu::MapMode::Write));
+ return !writable || (mMapMode & wgpu::MapMode::Write);
case BufferState::Unmapped:
case BufferState::Destroyed:
