encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jiawei Shao 2021-12-09 02:42:47 +00:00 committed by Dawn LUCI CQ
parent 78b6b5ef31
commit b6d80e027d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dawn_wire.json
View File

@ -66,14 +66,14 @@
{ "name": "signal value", "type": "uint64_t" }, { "name": "signal value", "type": "uint64_t" },
{ "name": "request serial", "type": "uint64_t" } { "name": "request serial", "type": "uint64_t" }
], ],
"queue write buffer internal": [ "queue write buffer": [
{"name": "queue id", "type": "ObjectId" }, {"name": "queue id", "type": "ObjectId" },
{"name": "buffer id", "type": "ObjectId" }, {"name": "buffer id", "type": "ObjectId" },
{"name": "buffer offset", "type": "uint64_t"}, {"name": "buffer offset", "type": "uint64_t"},
{"name": "data", "type": "uint8_t", "annotation": "const*", "length": "size"}, {"name": "data", "type": "uint8_t", "annotation": "const*", "length": "size"},
{"name": "size", "type": "uint64_t"} {"name": "size", "type": "uint64_t"}
], ],
"queue write texture internal": [ "queue write texture": [
{"name": "queue id", "type": "ObjectId" }, {"name": "queue id", "type": "ObjectId" },
{"name": "destination", "type": "image copy texture", "annotation": "const*"}, {"name": "destination", "type": "image copy texture", "annotation": "const*"},
{"name": "data", "type": "uint8_t", "annotation": "const*", "length": "data size"}, {"name": "data", "type": "uint8_t", "annotation": "const*", "length": "data size"},

4
src/dawn_wire/client/Queue.cpp
View File

@ -57,7 +57,7 @@ namespace dawn_wire { namespace client {
size_t size) { size_t size) {
Buffer* buffer = FromAPI(cBuffer); Buffer* buffer = FromAPI(cBuffer);
QueueWriteBufferInternalCmd cmd; QueueWriteBufferCmd cmd;
cmd.queueId = id; cmd.queueId = id;
cmd.bufferId = buffer->id; cmd.bufferId = buffer->id;
cmd.bufferOffset = bufferOffset; cmd.bufferOffset = bufferOffset;
@ -72,7 +72,7 @@ namespace dawn_wire { namespace client {
size_t dataSize, size_t dataSize,
const WGPUTextureDataLayout* dataLayout, const WGPUTextureDataLayout* dataLayout,
const WGPUExtent3D* writeSize) { const WGPUExtent3D* writeSize) {
QueueWriteTextureInternalCmd cmd; QueueWriteTextureCmd cmd;
cmd.queueId = id; cmd.queueId = id;
cmd.destination = destination; cmd.destination = destination;
cmd.data = static_cast<const uint8_t*>(data); cmd.data = static_cast<const uint8_t*>(data);

22
src/dawn_wire/server/ServerQueue.cpp
View File

@ -45,11 +45,11 @@ namespace dawn_wire { namespace server {
return true; return true;
} }
bool Server::DoQueueWriteBufferInternal(ObjectId queueId, bool Server::DoQueueWriteBuffer(ObjectId queueId,
ObjectId bufferId, ObjectId bufferId,
uint64_t bufferOffset, uint64_t bufferOffset,
const uint8_t* data, const uint8_t* data,
uint64_t size) { uint64_t size) {
// The null object isn't valid as `self` or `buffer` so we can combine the check with the // The null object isn't valid as `self` or `buffer` so we can combine the check with the
// check that the ID is valid. // check that the ID is valid.
auto* queue = QueueObjects().Get(queueId); auto* queue = QueueObjects().Get(queueId);
@ -73,12 +73,12 @@ namespace dawn_wire { namespace server {
return true; return true;
} }
bool Server::DoQueueWriteTextureInternal(ObjectId queueId, bool Server::DoQueueWriteTexture(ObjectId queueId,
const WGPUImageCopyTexture* destination, const WGPUImageCopyTexture* destination,
const uint8_t* data, const uint8_t* data,
uint64_t dataSize, uint64_t dataSize,
const WGPUTextureDataLayout* dataLayout, const WGPUTextureDataLayout* dataLayout,
const WGPUExtent3D* writeSize) { const WGPUExtent3D* writeSize) {
// The null object isn't valid as `self` so we can combine the check with the // The null object isn't valid as `self` so we can combine the check with the
// check that the ID is valid. // check that the ID is valid.
auto* queue = QueueObjects().Get(queueId); auto* queue = QueueObjects().Get(queueId);