dawn_wire: Rename Write{Buffer|Texture}Internal to Write{Buffer|Texture}
BUG=chromium:1266727
Change-Id: I3cad4c7b6b09ef4475ff030a5d239f544dc1cdef
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/72066
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
diff --git a/dawn_wire.json b/dawn_wire.json
index 75526d5..5742573 100644
--- a/dawn_wire.json
+++ b/dawn_wire.json
@@ -66,14 +66,14 @@
{ "name": "signal value", "type": "uint64_t" },
{ "name": "request serial", "type": "uint64_t" }
],
- "queue write buffer internal": [
+ "queue write buffer": [
{"name": "queue id", "type": "ObjectId" },
{"name": "buffer id", "type": "ObjectId" },
{"name": "buffer offset", "type": "uint64_t"},
{"name": "data", "type": "uint8_t", "annotation": "const*", "length": "size"},
{"name": "size", "type": "uint64_t"}
],
- "queue write texture internal": [
+ "queue write texture": [
{"name": "queue id", "type": "ObjectId" },
{"name": "destination", "type": "image copy texture", "annotation": "const*"},
{"name": "data", "type": "uint8_t", "annotation": "const*", "length": "data size"},
diff --git a/src/dawn_wire/client/Queue.cpp b/src/dawn_wire/client/Queue.cpp
index 098ddc5..daa44d7 100644
--- a/src/dawn_wire/client/Queue.cpp
+++ b/src/dawn_wire/client/Queue.cpp
@@ -57,7 +57,7 @@
size_t size) {
Buffer* buffer = FromAPI(cBuffer);
- QueueWriteBufferInternalCmd cmd;
+ QueueWriteBufferCmd cmd;
cmd.queueId = id;
cmd.bufferId = buffer->id;
cmd.bufferOffset = bufferOffset;
@@ -72,7 +72,7 @@
size_t dataSize,
const WGPUTextureDataLayout* dataLayout,
const WGPUExtent3D* writeSize) {
- QueueWriteTextureInternalCmd cmd;
+ QueueWriteTextureCmd cmd;
cmd.queueId = id;
cmd.destination = destination;
cmd.data = static_cast<const uint8_t*>(data);
diff --git a/src/dawn_wire/server/ServerQueue.cpp b/src/dawn_wire/server/ServerQueue.cpp
index 0ab99f5..08a5925 100644
--- a/src/dawn_wire/server/ServerQueue.cpp
+++ b/src/dawn_wire/server/ServerQueue.cpp
@@ -45,11 +45,11 @@
return true;
}
- bool Server::DoQueueWriteBufferInternal(ObjectId queueId,
- ObjectId bufferId,
- uint64_t bufferOffset,
- const uint8_t* data,
- uint64_t size) {
+ bool Server::DoQueueWriteBuffer(ObjectId queueId,
+ ObjectId bufferId,
+ uint64_t bufferOffset,
+ const uint8_t* data,
+ uint64_t size) {
// The null object isn't valid as `self` or `buffer` so we can combine the check with the
// check that the ID is valid.
auto* queue = QueueObjects().Get(queueId);
@@ -73,12 +73,12 @@
return true;
}
- bool Server::DoQueueWriteTextureInternal(ObjectId queueId,
- const WGPUImageCopyTexture* destination,
- const uint8_t* data,
- uint64_t dataSize,
- const WGPUTextureDataLayout* dataLayout,
- const WGPUExtent3D* writeSize) {
+ bool Server::DoQueueWriteTexture(ObjectId queueId,
+ const WGPUImageCopyTexture* destination,
+ const uint8_t* data,
+ uint64_t dataSize,
+ const WGPUTextureDataLayout* dataLayout,
+ const WGPUExtent3D* writeSize) {
// The null object isn't valid as `self` so we can combine the check with the
// check that the ID is valid.
auto* queue = QueueObjects().Get(queueId);