Implement serialization/deserialization of DawnDeviceProperties

This patch implements the serialization and deserialization of
DawnDeviceProperties in dawn_wire for the use of serializing this type
of object in Chromium.

BUG=chromium:996713
TEST=dawn_unittests

Change-Id: I1678627a017079540689d8529a1a7e1c975aae61
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/12240
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Jiawei Shao 2019-10-20 03:01:56 +00:00 committed by Commit Bot service account
parent f603903da7
commit 5c2f5f3961
5 changed files with 84 additions and 0 deletions

View File

@ -815,6 +815,7 @@ test("dawn_unittests") {
"src/tests/unittests/wire/WireArgumentTests.cpp",
"src/tests/unittests/wire/WireBasicTests.cpp",
"src/tests/unittests/wire/WireBufferMappingTests.cpp",
"src/tests/unittests/wire/WireDawnDevicePropertiesTests.cpp",
"src/tests/unittests/wire/WireErrorCallbackTests.cpp",
"src/tests/unittests/wire/WireFenceTests.cpp",
"src/tests/unittests/wire/WireInjectTextureTests.cpp",

View File

@ -579,6 +579,13 @@
}
]
},
"device properties": {
"category": "structure",
"extensible": false,
"members": [
{"name": "texture compression BC", "type": "bool", "default": "false"}
]
},
"depth stencil state descriptor": {
"category": "structure",
"extensible": true,

View File

@ -15,6 +15,7 @@
#include "dawn_wire/WireCmd_autogen.h"
#include "common/Assert.h"
#include "dawn_wire/Wire.h"
#include <algorithm>
#include <cstring>
@ -455,4 +456,34 @@ namespace dawn_wire {
{{ write_command_serialization_methods(command, True) }}
{% endfor %}
// Implementations of serialization/deserialization of DawnDeviceProperties.
size_t SerializedDawnDevicePropertiesSize(const DawnDeviceProperties* deviceProperties) {
return sizeof(DawnDeviceProperties) +
DawnDevicePropertiesGetExtraRequiredSize(*deviceProperties);
}
void SerializeDawnDeviceProperties(const DawnDeviceProperties* deviceProperties,
char* serializeBuffer) {
size_t devicePropertiesSize = SerializedDawnDevicePropertiesSize(deviceProperties);
DawnDevicePropertiesTransfer* transfer =
reinterpret_cast<DawnDevicePropertiesTransfer*>(serializeBuffer);
serializeBuffer += devicePropertiesSize;
DawnDevicePropertiesSerialize(*deviceProperties, transfer, &serializeBuffer);
}
bool DeserializeDawnDeviceProperties(DawnDeviceProperties* deviceProperties,
const volatile char* deserializeBuffer) {
size_t devicePropertiesSize = SerializedDawnDevicePropertiesSize(deviceProperties);
const volatile DawnDevicePropertiesTransfer* transfer = nullptr;
if (GetPtrFromBuffer(&deserializeBuffer, &devicePropertiesSize, 1, &transfer) !=
DeserializeResult::Success) {
return false;
}
return DawnDevicePropertiesDeserialize(deviceProperties, transfer, &deserializeBuffer,
&devicePropertiesSize,
nullptr) == DeserializeResult::Success;
}
} // namespace dawn_wire

View File

@ -35,6 +35,15 @@ namespace dawn_wire {
virtual const volatile char* HandleCommands(const volatile char* commands, size_t size) = 0;
};
DAWN_WIRE_EXPORT size_t
SerializedDawnDevicePropertiesSize(const DawnDeviceProperties* deviceProperties);
DAWN_WIRE_EXPORT void SerializeDawnDeviceProperties(
const DawnDeviceProperties* deviceProperties,
char* serializeBuffer);
DAWN_WIRE_EXPORT bool DeserializeDawnDeviceProperties(DawnDeviceProperties* deviceProperties,
const volatile char* deserializeBuffer);
} // namespace dawn_wire
#endif // DAWNWIRE_WIRE_H_

View File

@ -0,0 +1,36 @@
// Copyright 2019 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "dawn_wire/Wire.h"
#include "gtest/gtest.h"
#include <vector>
class WireDawnDevicePropertiesTests : public testing::Test {};
// Test that the serialization and deserialization of DawnDeviceProperties can work correctly.
TEST_F(WireDawnDevicePropertiesTests, SerializeDawnDeviceProperties) {
DawnDeviceProperties sentDawnDeviceProperties;
sentDawnDeviceProperties.textureCompressionBC = true;
size_t sentDawnDevicePropertiesSize =
dawn_wire::SerializedDawnDevicePropertiesSize(&sentDawnDeviceProperties);
std::vector<char> buffer;
buffer.resize(sentDawnDevicePropertiesSize);
dawn_wire::SerializeDawnDeviceProperties(&sentDawnDeviceProperties, buffer.data());
DawnDeviceProperties receivedDawnDeviceProperties;
dawn_wire::DeserializeDawnDeviceProperties(&receivedDawnDeviceProperties, buffer.data());
ASSERT_TRUE(receivedDawnDeviceProperties.textureCompressionBC);
}