commit 2c350761c24c81885053d3a27aa5ee48925fd610
author Brian Osman <brianosman@google.com> Thu Feb 18 10:55:50 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 18 17:17:32 2021 +0000
tree c6684ad9521c99b70fc4d78ce55e6f79227cde48
parent 8b01c6d113627866a13c6dfaab68e6237037b68d

Route Dawn shader compile errors through the error handler

Change-Id: Ia7fb5dfc0239ab0fdd3259246b727b7f901dca7b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/372017
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/dawn/GrDawnGpu.cpp

diff --git a/src/gpu/dawn/GrDawnGpu.cpp b/src/gpu/dawn/GrDawnGpu.cpp
index dd69e72..9e64a05 100644
--- a/src/gpu/dawn/GrDawnGpu.cpp
+++ b/src/gpu/dawn/GrDawnGpu.cpp
@@ -927,6 +927,7 @@
 
 SkSL::String GrDawnGpu::SkSLToSPIRV(const char* shaderString, SkSL::ProgramKind kind, bool flipY,
                                     uint32_t rtHeightOffset, SkSL::Program::Inputs* inputs) {
+    auto errorHandler = this->getContext()->priv().getShaderErrorHandler();
     SkSL::Program::Settings settings;
     settings.fFlipY = flipY;
     settings.fRTHeightOffset = rtHeightOffset;
@@ -937,8 +938,7 @@
         shaderString,
         settings);
     if (!program) {
-        SkDebugf("SkSL error:\n%s\n", this->shaderCompiler()->errorText().c_str());
-        SkASSERT(false);
+        errorHandler->compileError(shaderString, this->shaderCompiler()->errorText().c_str());
         return "";
     }
     if (inputs) {
@@ -946,6 +946,7 @@
     }
     SkSL::String code;
     if (!this->shaderCompiler()->toSPIRV(*program, &code)) {
+        errorHandler->compileError(shaderString, this->shaderCompiler()->errorText().c_str());
         return "";
     }
     return code;