Remove newly-added SkSL::DebugTrace base class.

Slight rework of the SkRuntimeEffect trace design means we won't expose
any debug-trace class at the public level, so an interface base class
doesn't add value after all.

Change-Id: I82739e9c5ba5ce5c7a63793ec0c09a50ab19fbb3
Bug: skia:12708
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/480776
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
John Stiles 2021-12-06 19:05:59 -05:00 committed by SkCQ
parent 4388f16262
commit 873a39ebd1
3 changed files with 3 additions and 33 deletions

View File

@ -31,7 +31,6 @@ skia_sksl_sources = [
"$_include/sksl/DSLSymbols.h",
"$_include/sksl/DSLType.h",
"$_include/sksl/DSLVar.h",
"$_include/sksl/SkSLDebugTrace.h",
"$_include/sksl/SkSLErrorReporter.h",
"$_src/sksl/SkSLAnalysis.cpp",
"$_src/sksl/SkSLAnalysis.h",

View File

@ -1,28 +0,0 @@
/*
* Copyright 2021 Google LLC.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SKSL_DEBUG_TRACE
#define SKSL_DEBUG_TRACE
class SkWStream;
namespace SkSL {
class DebugTrace {
public:
virtual ~DebugTrace() = default;
/** Serializes a debug trace to JSON which can be parsed by our debugger. */
virtual void writeTrace(SkWStream* w) const = 0;
/** Generates a human-readable dump of the debug trace. */
virtual void dump(SkWStream* o) const = 0;
};
} // namespace SkSL
#endif

View File

@ -9,7 +9,6 @@
#define SKVMDEBUGTRACE
#include "include/core/SkPoint.h"
#include "include/sksl/SkSLDebugTrace.h"
#include "src/core/SkVM.h"
#include "src/sksl/ir/SkSLType.h"
@ -50,7 +49,7 @@ struct SkVMTraceInfo {
int32_t data[2];
};
class SkVMDebugTrace : public DebugTrace {
class SkVMDebugTrace {
public:
/**
* Sets the device-coordinate pixel to trace. If it's not set, the point at (0, 0) will be used.
@ -62,10 +61,10 @@ public:
/** Serializes a debug trace to JSON which can be parsed by our debugger. */
bool readTrace(SkStream* r);
void writeTrace(SkWStream* w) const override;
void writeTrace(SkWStream* w) const;
/** Generates a human-readable dump of the debug trace. */
void dump(SkWStream* o) const override;
void dump(SkWStream* o) const;
/** The device-coordinate pixel to trace (controlled by setTraceCoord) */
SkIPoint fTraceCoord = {};