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

Fix compilation with MSVC of volatile assignment operator 

Bug: dawn:230
Change-Id: Ie6e4ddf52132a6980d86c9d80524385b51d9d0d6
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/12200
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Austin Eng 2019-10-15 07:30:35 +00:00 committed by Commit Bot service account
parent 2e666bd5de
commit b0cdf95213
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
generator/templates/dawn_wire/WireCmd.cpp
View File

@ -369,8 +369,12 @@ namespace dawn_wire {
ObjectHandle::ObjectHandle() = default; ObjectHandle::ObjectHandle() = default;
ObjectHandle::ObjectHandle(ObjectId id, ObjectSerial serial) : id(id), serial(serial) {} ObjectHandle::ObjectHandle(ObjectId id, ObjectSerial serial) : id(id), serial(serial) {}
ObjectHandle::ObjectHandle(const volatile ObjectHandle& rhs) : id(rhs.id), serial(rhs.serial) {} ObjectHandle::ObjectHandle(const volatile ObjectHandle& rhs) : id(rhs.id), serial(rhs.serial) {}
ObjectHandle& ObjectHandle::operator=(const ObjectHandle& rhs) = default; ObjectHandle& ObjectHandle::AssignFrom(const ObjectHandle& rhs) {
ObjectHandle& ObjectHandle::operator=(const volatile ObjectHandle& rhs) { id = rhs.id;
serial = rhs.serial;
return *this;
}
ObjectHandle& ObjectHandle::AssignFrom(const volatile ObjectHandle& rhs) {
id = rhs.id; id = rhs.id;
serial = rhs.serial; serial = rhs.serial;
return *this; return *this;

11
generator/templates/dawn_wire/WireCmd.h
View File

@ -28,8 +28,15 @@ namespace dawn_wire {
ObjectHandle(); ObjectHandle();
ObjectHandle(ObjectId id, ObjectSerial serial); ObjectHandle(ObjectId id, ObjectSerial serial);
ObjectHandle(const volatile ObjectHandle& rhs); ObjectHandle(const volatile ObjectHandle& rhs);
ObjectHandle& operator=(const ObjectHandle& rhs);
ObjectHandle& operator=(const volatile ObjectHandle& rhs); // MSVC has a bug where it thinks the volatile copy assignment is a duplicate.
// Workaround this by forwarding to a different function AssignFrom.
template <typename T>
ObjectHandle& operator=(const T& rhs) {
return AssignFrom(rhs);
}
ObjectHandle& AssignFrom(const ObjectHandle& rhs);
ObjectHandle& AssignFrom(const volatile ObjectHandle& rhs);
}; };
enum class DeserializeResult { enum class DeserializeResult {