encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-16 16:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Rename dawn_wire Object "serial" to "generation"

Browse Source 
This is a more accurate name and conflicts less with the callback
request serials.

Bug: none
Change-Id: I0f9660c24468064dadffb3ab9b3392d403f93c41
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/19260
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Austin Eng
2020-04-13 17:50:51 +00:00
committed by Commit Bot service account
parent 077a427499
commit 518c8e77ab
12 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dawn_wire/server/ServerBuffer.cpp
View File

@@ -70,7 +70,7 @@ namespace dawn_wire { namespace server {
std::unique_ptr<MapUserdata> userdata = std::make_unique<MapUserdata>();
userdata->server = this;
userdata->buffer = ObjectHandle{bufferId, buffer->serial};
userdata->buffer = ObjectHandle{bufferId, buffer->generation};
userdata->requestSerial = requestSerial;
// The handle will point to the mapped memory or staging memory for the mapping.
@@ -120,7 +120,7 @@ namespace dawn_wire { namespace server {
if (resultData == nullptr) {
return false;
}
resultData->serial = bufferResult.serial;
resultData->generation = bufferResult.generation;
WGPUCreateBufferMappedResult result = mProcs.deviceCreateBufferMapped(device, descriptor);
ASSERT(result.buffer != nullptr);
@@ -168,7 +168,7 @@ namespace dawn_wire { namespace server {
ASSERT(bufferData != nullptr);
ReturnBufferMapWriteAsyncCallbackCmd cmd;
cmd.buffer = ObjectHandle{bufferResult.id, bufferResult.serial};
cmd.buffer = ObjectHandle{bufferResult.id, bufferResult.generation};
cmd.requestSerial = requestSerial;
cmd.status = bufferData->mapWriteState == BufferMapWriteState::Mapped
? WGPUBufferMapAsyncStatus_Success
@@ -260,7 +260,7 @@ namespace dawn_wire { namespace server {
// Skip sending the callback if the buffer has already been destroyed.
auto* bufferData = BufferObjects().Get(data->buffer.id);
if (bufferData == nullptr || bufferData->serial != data->buffer.serial) {
if (bufferData == nullptr || bufferData->generation != data->buffer.generation) {
return;
}
@@ -302,7 +302,7 @@ namespace dawn_wire { namespace server {
// Skip sending the callback if the buffer has already been destroyed.
auto* bufferData = BufferObjects().Get(data->buffer.id);
if (bufferData == nullptr || bufferData->serial != data->buffer.serial) {
if (bufferData == nullptr || bufferData->generation != data->buffer.generation) {
return;
}