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

Make dawn_wire use the webgpu.h header

Browse Source 
BUG=dawn:22

Change-Id: I4963aa27322086e74947a1a6265c921e2c7d3d85
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/12700
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez
2019-10-24 22:27:27 +00:00
committed by Commit Bot service account
parent 15e751e418
commit 1fdcb16b69
30 changed files with 179 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,12 +16,12 @@
namespace dawn_wire { namespace server {
void Server::ForwardUncapturedError(DawnErrorType type, const char* message, void* userdata) {
void Server::ForwardUncapturedError(WGPUErrorType type, const char* message, void* userdata) {
auto server = static_cast<Server*>(userdata);
server->OnUncapturedError(type, message);
}
void Server::OnUncapturedError(DawnErrorType type, const char* message) {
void Server::OnUncapturedError(WGPUErrorType type, const char* message) {
ReturnDeviceUncapturedErrorCallbackCmd cmd;
cmd.type = type;
cmd.message = message;
@@ -31,7 +31,7 @@ namespace dawn_wire { namespace server {
cmd.Serialize(allocatedBuffer);
}
bool Server::DoDevicePopErrorScope(DawnDevice cDevice, uint64_t requestSerial) {
bool Server::DoDevicePopErrorScope(WGPUDevice cDevice, uint64_t requestSerial) {
ErrorScopeUserdata* userdata = new ErrorScopeUserdata;
userdata->server = this;
userdata->requestSerial = requestSerial;
@@ -44,12 +44,12 @@ namespace dawn_wire { namespace server {
}
// static
void Server::ForwardPopErrorScope(DawnErrorType type, const char* message, void* userdata) {
void Server::ForwardPopErrorScope(WGPUErrorType type, const char* message, void* userdata) {
auto* data = reinterpret_cast<ErrorScopeUserdata*>(userdata);
data->server->OnDevicePopErrorScope(type, message, data);
}
void Server::OnDevicePopErrorScope(DawnErrorType type,
void Server::OnDevicePopErrorScope(WGPUErrorType type,
const char* message,
ErrorScopeUserdata* userdata) {
std::unique_ptr<ErrorScopeUserdata> data{userdata};