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

Add descriptive error contexts to adapter initialization 

To help diagnose issues where Dawn fails to create or initialize
an adapter.

Bug: none
Change-Id: I0c757f99596e9b4ac0e559807654ffaf9cb03feb
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/69420
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng 2021-11-16 00:50:04 +00:00 committed by Dawn LUCI CQ
parent 1dc31428f1
commit 7065c21fbb
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dawn_native/Adapter.cpp
View File

@ -25,9 +25,19 @@ namespace dawn_native {
} }
MaybeError AdapterBase::Initialize() { MaybeError AdapterBase::Initialize() {
DAWN_TRY(InitializeImpl()); DAWN_TRY_CONTEXT(InitializeImpl(), "initializing adapter (backend=%s)", mBackend);
DAWN_TRY(InitializeSupportedFeaturesImpl()); DAWN_TRY_CONTEXT(
DAWN_TRY(InitializeSupportedLimitsImpl(&mLimits)); InitializeSupportedFeaturesImpl(),
"gathering supported features for \"%s\" - \"%s\" (vendorId=%#06x deviceId=%#06x "
"backend=%s type=%s)",
mPCIInfo.name, mDriverDescription, mPCIInfo.vendorId, mPCIInfo.deviceId, mBackend,
mAdapterType);
DAWN_TRY_CONTEXT(
InitializeSupportedLimitsImpl(&mLimits),
"gathering supported limits for \"%s\" - \"%s\" (vendorId=%#06x deviceId=%#06x "
"backend=%s type=%s)",
mPCIInfo.name, mDriverDescription, mPCIInfo.vendorId, mPCIInfo.deviceId, mBackend,
mAdapterType);
// Enforce internal Dawn constants. // Enforce internal Dawn constants.
mLimits.v1.maxVertexBufferArrayStride = mLimits.v1.maxVertexBufferArrayStride =

8
src/dawn_native/Error.h
View File

@ -113,12 +113,8 @@ namespace dawn_native {
// the current function. // the current function.
#define DAWN_TRY(EXPR) DAWN_TRY_WITH_CLEANUP(EXPR, {}) #define DAWN_TRY(EXPR) DAWN_TRY_WITH_CLEANUP(EXPR, {})
#define DAWN_TRY_CONTEXT(EXPR, ...) \ #define DAWN_TRY_CONTEXT(EXPR, ...) \
DAWN_TRY_WITH_CLEANUP(EXPR, { \ DAWN_TRY_WITH_CLEANUP(EXPR, { error->AppendContext(absl::StrFormat(__VA_ARGS__)); })
if (error->GetType() == InternalErrorType::Validation) { \
error->AppendContext(absl::StrFormat(__VA_ARGS__)); \
} \
})
#define DAWN_TRY_WITH_CLEANUP(EXPR, BODY) \ #define DAWN_TRY_WITH_CLEANUP(EXPR, BODY) \
{ \ { \

6
src/dawn_native/ErrorData.cpp
View File

@ -79,7 +79,11 @@ namespace dawn_native {
for (auto context : mContexts) { for (auto context : mContexts) {
ss << " - While " << context << "\n"; ss << " - While " << context << "\n";
} }
} else { }
// For non-validation errors, or erros that lack a context include the
// stack trace for debugging purposes.
if (mContexts.empty() || mType != InternalErrorType::Validation) {
for (const auto& callsite : mBacktrace) { for (const auto& callsite : mBacktrace) {
ss << " at " << callsite.function << " (" << callsite.file << ":" ss << " at " << callsite.function << " (" << callsite.file << ":"
<< callsite.line << ")\n"; << callsite.line << ")\n";