encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-10 23:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagate more errors from reentrant calls

Browse Source 
This CL propagates errors from reentrant WriteBuffer calls and makes
procy methods on BufferBase to show that it is safe to call
GetMappedRange and Unmap without handling errors.

Bug: dawn:723
Change-Id: I4ea43adc4844505314bf84e2357b2d928f1d1f8c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46003
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
This commit is contained in:
Corentin Wallez 2021-03-31 11:24:42 +00:00 committed by Commit Bot service account
parent 348806be74
commit 79c9d125f2
7 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dawn_native/Buffer.cpp
View File

@ -186,13 +186,11 @@ namespace dawn_native {
DeviceBase* device = GetDevice(); DeviceBase* device = GetDevice();
if (device->IsToggleEnabled(Toggle::LazyClearResourceOnFirstUse)) { if (device->IsToggleEnabled(Toggle::LazyClearResourceOnFirstUse)) {
// TODO(dawn:723): propagate any errors from GetMappedRange. memset(GetMappedRange(0, mSize), uint8_t(0u), mSize);
memset(APIGetMappedRange(0, mSize), uint8_t(0u), mSize);
SetIsDataInitialized(); SetIsDataInitialized();
device->IncrementLazyClearCountForTesting(); device->IncrementLazyClearCountForTesting();
} else if (device->IsToggleEnabled(Toggle::NonzeroClearResourcesOnCreationForTesting)) { } else if (device->IsToggleEnabled(Toggle::NonzeroClearResourcesOnCreationForTesting)) {
// TODO(dawn:723): propagate any errors from GetMappedRange. memset(GetMappedRange(0, mSize), uint8_t(1u), mSize);
memset(APIGetMappedRange(0, mSize), uint8_t(1u), mSize);
} }
return {}; return {};
@ -294,14 +292,14 @@ namespace dawn_native {
} }
void* BufferBase::APIGetMappedRange(size_t offset, size_t size) { void* BufferBase::APIGetMappedRange(size_t offset, size_t size) {
return GetMappedRangeInternal(true, offset, size); return GetMappedRange(offset, size, true);
} }
const void* BufferBase::APIGetConstMappedRange(size_t offset, size_t size) { const void* BufferBase::APIGetConstMappedRange(size_t offset, size_t size) {
return GetMappedRangeInternal(false, offset, size); return GetMappedRange(offset, size, false);
} }
void* BufferBase::GetMappedRangeInternal(bool writable, size_t offset, size_t size) { void* BufferBase::GetMappedRange(size_t offset, size_t size, bool writable) {
if (!CanGetMappedRange(writable, offset, size)) { if (!CanGetMappedRange(writable, offset, size)) {
return nullptr; return nullptr;
} }
@ -357,6 +355,10 @@ namespace dawn_native {
} }
void BufferBase::APIUnmap() { void BufferBase::APIUnmap() {
Unmap();
}
void BufferBase::Unmap() {
UnmapInternal(WGPUBufferMapAsyncStatus_UnmappedBeforeCallback); UnmapInternal(WGPUBufferMapAsyncStatus_UnmappedBeforeCallback);
} }

4
src/dawn_native/Buffer.h
View File

@ -61,6 +61,9 @@ namespace dawn_native {
bool IsDataInitialized() const; bool IsDataInitialized() const;
void SetIsDataInitialized(); void SetIsDataInitialized();
void* GetMappedRange(size_t offset, size_t size, bool writable = true);
void Unmap();
// Dawn API // Dawn API
void APIMapAsync(wgpu::MapMode mode, void APIMapAsync(wgpu::MapMode mode,
size_t offset, size_t offset,
@ -91,7 +94,6 @@ namespace dawn_native {
virtual bool IsCPUWritableAtCreation() const = 0; virtual bool IsCPUWritableAtCreation() const = 0;
MaybeError CopyFromStagingBuffer(); MaybeError CopyFromStagingBuffer();
void* GetMappedRangeInternal(bool writable, size_t offset, size_t size);
void CallMapCallback(MapRequestID mapID, WGPUBufferMapAsyncStatus status); void CallMapCallback(MapRequestID mapID, WGPUBufferMapAsyncStatus status);
MaybeError ValidateMap(wgpu::BufferUsage requiredUsage, MaybeError ValidateMap(wgpu::BufferUsage requiredUsage,

25
src/dawn_native/CommandEncoder.cpp
View File

@ -399,11 +399,11 @@ namespace dawn_native {
return {}; return {};
} }
void EncodeTimestampsToNanosecondsConversion(CommandEncoder* encoder, MaybeError EncodeTimestampsToNanosecondsConversion(CommandEncoder* encoder,
QuerySetBase* querySet, QuerySetBase* querySet,
uint32_t queryCount, uint32_t queryCount,
BufferBase* destination, BufferBase* destination,
uint64_t destinationOffset) { uint64_t destinationOffset) {
DeviceBase* device = encoder->GetDevice(); DeviceBase* device = encoder->GetDevice();
// The availability got from query set is a reference to vector<bool>, need to covert // The availability got from query set is a reference to vector<bool>, need to covert
@ -419,9 +419,9 @@ namespace dawn_native {
// TODO(dawn:723): change to not use AcquireRef for reentrant object creation. // TODO(dawn:723): change to not use AcquireRef for reentrant object creation.
Ref<BufferBase> availabilityBuffer = Ref<BufferBase> availabilityBuffer =
AcquireRef(device->APICreateBuffer(&availabilityDesc)); AcquireRef(device->APICreateBuffer(&availabilityDesc));
// TODO(dawn:723): propagate any errors from WriteBuffer. DAWN_TRY(device->GetQueue()->WriteBuffer(availabilityBuffer.Get(), 0,
device->GetQueue()->APIWriteBuffer(availabilityBuffer.Get(), 0, availability.data(), availability.data(),
availability.size() * sizeof(uint32_t)); availability.size() * sizeof(uint32_t)));
// Timestamp params uniform buffer // Timestamp params uniform buffer
TimestampParams params = {queryCount, static_cast<uint32_t>(destinationOffset), TimestampParams params = {queryCount, static_cast<uint32_t>(destinationOffset),
@ -431,11 +431,12 @@ namespace dawn_native {
parmsDesc.size = sizeof(params); parmsDesc.size = sizeof(params);
// TODO(dawn:723): change to not use AcquireRef for reentrant object creation. // TODO(dawn:723): change to not use AcquireRef for reentrant object creation.
Ref<BufferBase> paramsBuffer = AcquireRef(device->APICreateBuffer(&parmsDesc)); Ref<BufferBase> paramsBuffer = AcquireRef(device->APICreateBuffer(&parmsDesc));
// TODO(dawn:723): propagate any errors from WriteBuffer. DAWN_TRY(
device->GetQueue()->APIWriteBuffer(paramsBuffer.Get(), 0, &params, sizeof(params)); device->GetQueue()->WriteBuffer(paramsBuffer.Get(), 0, &params, sizeof(params)));
EncodeConvertTimestampsToNanoseconds(encoder, destination, availabilityBuffer.Get(), EncodeConvertTimestampsToNanoseconds(encoder, destination, availabilityBuffer.Get(),
paramsBuffer.Get()); paramsBuffer.Get());
return {};
} }
} // namespace } // namespace
@ -869,8 +870,8 @@ namespace dawn_native {
// Encode internal compute pipeline for timestamp query // Encode internal compute pipeline for timestamp query
if (querySet->GetQueryType() == wgpu::QueryType::Timestamp && if (querySet->GetQueryType() == wgpu::QueryType::Timestamp &&
GetDevice()->IsToggleEnabled(Toggle::ConvertTimestampsToNanoseconds)) { GetDevice()->IsToggleEnabled(Toggle::ConvertTimestampsToNanoseconds)) {
EncodeTimestampsToNanosecondsConversion(this, querySet, queryCount, destination, DAWN_TRY(EncodeTimestampsToNanosecondsConversion(this, querySet, queryCount,
destinationOffset); destination, destinationOffset));
} }
return {}; return {};

5
src/dawn_native/CopyTextureForBrowserHelper.cpp
View File

@ -273,9 +273,8 @@ namespace dawn_native {
// TODO(dawn:723): change to not use AcquireRef for reentrant object creation. // TODO(dawn:723): change to not use AcquireRef for reentrant object creation.
Ref<BufferBase> uniformBuffer = AcquireRef(device->APICreateBuffer(&uniformDesc)); Ref<BufferBase> uniformBuffer = AcquireRef(device->APICreateBuffer(&uniformDesc));
// TODO(dawn:723): propagate any errors from WriteBuffer. DAWN_TRY(device->GetQueue()->WriteBuffer(uniformBuffer.Get(), 0, uniformData,
device->GetQueue()->APIWriteBuffer(uniformBuffer.Get(), 0, uniformData, sizeof(uniformData)));
sizeof(uniformData));
// Prepare binding 1 resource: sampler // Prepare binding 1 resource: sampler
// Use default configuration, filterMode set to Nearest for min and mag. // Use default configuration, filterMode set to Nearest for min and mag.

10
src/dawn_native/Queue.cpp
View File

@ -266,13 +266,13 @@ namespace dawn_native {
uint64_t bufferOffset, uint64_t bufferOffset,
const void* data, const void* data,
size_t size) { size_t size) {
GetDevice()->ConsumedError(WriteBufferInternal(buffer, bufferOffset, data, size)); GetDevice()->ConsumedError(WriteBuffer(buffer, bufferOffset, data, size));
} }
MaybeError QueueBase::WriteBufferInternal(BufferBase* buffer, MaybeError QueueBase::WriteBuffer(BufferBase* buffer,
uint64_t bufferOffset, uint64_t bufferOffset,
const void* data, const void* data,
size_t size) { size_t size) {
DAWN_TRY(ValidateWriteBuffer(buffer, bufferOffset, size)); DAWN_TRY(ValidateWriteBuffer(buffer, bufferOffset, size));
return WriteBufferImpl(buffer, bufferOffset, data, size); return WriteBufferImpl(buffer, bufferOffset, data, size);
} }

8
src/dawn_native/Queue.h
View File

@ -57,6 +57,10 @@ namespace dawn_native {
const Extent3D* copySize, const Extent3D* copySize,
const CopyTextureForBrowserOptions* options); const CopyTextureForBrowserOptions* options);
MaybeError WriteBuffer(BufferBase* buffer,
uint64_t bufferOffset,
const void* data,
size_t size);
void TrackTask(std::unique_ptr<TaskInFlight> task, ExecutionSerial serial); void TrackTask(std::unique_ptr<TaskInFlight> task, ExecutionSerial serial);
void Tick(ExecutionSerial finishedSerial); void Tick(ExecutionSerial finishedSerial);
void HandleDeviceLoss(); void HandleDeviceLoss();
@ -66,10 +70,6 @@ namespace dawn_native {
QueueBase(DeviceBase* device, ObjectBase::ErrorTag tag); QueueBase(DeviceBase* device, ObjectBase::ErrorTag tag);
private: private:
MaybeError WriteBufferInternal(BufferBase* buffer,
uint64_t bufferOffset,
const void* data,
size_t size);
MaybeError WriteTextureInternal(const ImageCopyTexture* destination, MaybeError WriteTextureInternal(const ImageCopyTexture* destination,
const void* data, const void* data,
size_t dataSize, size_t dataSize,

6
src/dawn_native/opengl/TextureGL.cpp
View File

@ -383,10 +383,8 @@ namespace dawn_native { namespace opengl {
DAWN_TRY_ASSIGN(srcBuffer, Buffer::CreateInternalBuffer(device, &descriptor, false)); DAWN_TRY_ASSIGN(srcBuffer, Buffer::CreateInternalBuffer(device, &descriptor, false));
// Fill the buffer with clear color // Fill the buffer with clear color
// TODO(dawn:723): propagate any errors from GetMappedRange. memset(srcBuffer->GetMappedRange(0, descriptor.size), clearColor, descriptor.size);
memset(srcBuffer->APIGetMappedRange(0, descriptor.size), clearColor, descriptor.size); srcBuffer->Unmap();
// TODO(dawn:723): propagate any errors from Unmap.
srcBuffer->APIUnmap();
// Bind buffer and texture, and make the buffer to texture copy // Bind buffer and texture, and make the buffer to texture copy
gl.PixelStorei(GL_UNPACK_ROW_LENGTH, gl.PixelStorei(GL_UNPACK_ROW_LENGTH,