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

Forward unhandled builder errors to the device

Browse Source
This commit is contained in:
Corentin Wallez
2017-07-27 19:43:43 -04:00
committed by Corentin Wallez
parent ba6a36c974
commit 3818e18c5c
3 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
generator/templates/wire/WireClient.cpp
View File

@@ -18,9 +18,10 @@
#include "common/Assert.h"
#include <cstring>
#include <iostream>
#include <cstdlib>
#include <map>
#include <memory>
#include <string>
#include <vector>
namespace nxt {
@@ -31,24 +32,19 @@ namespace wire {
class Device;
void PrintBuilderError(nxtBuilderErrorStatus status, const char* message, nxtCallbackUserdata, nxtCallbackUserdata) {
if (status == NXT_BUILDER_ERROR_STATUS_SUCCESS || status == NXT_BUILDER_ERROR_STATUS_UNKNOWN) {
return;
}
std::cout << "Got a builder error " << status << ": " << message << std::endl;
}
struct BuilderCallbackData {
void Call(nxtBuilderErrorStatus status, const char* message) {
bool Call(nxtBuilderErrorStatus status, const char* message) {
if (canCall && callback != nullptr) {
canCall = true;
callback(status, message, userdata1, userdata2);
return true;
}
return false;
}
//* For help with development, prints all builder errors by default.
nxtBuilderErrorCallback callback = PrintBuilderError;
nxtBuilderErrorCallback callback = nullptr;
nxtCallbackUserdata userdata1 = 0;
nxtCallbackUserdata userdata2 = 0;
bool canCall = true;
@@ -504,7 +500,13 @@ namespace wire {
return true;
}
builtObject->builderCallback.Call(static_cast<nxtBuilderErrorStatus>(cmd->status), cmd->GetMessage());
bool called = builtObject->builderCallback.Call(static_cast<nxtBuilderErrorStatus>(cmd->status), cmd->GetMessage());
// Unhandled builder errors are forwarded to the device
if (!called && cmd->status != NXT_BUILDER_ERROR_STATUS_SUCCESS && cmd->status != NXT_BUILDER_ERROR_STATUS_UNKNOWN) {
builtObject->device->HandleError(("Unhandled builder error: " + std::string(cmd->GetMessage())).c_str());
}
return true;
}
{% endfor %}