4dca83162b
This CL is mostly mechanical. It:
replaces "src/gpu/GrSurfaceDrawContext.h" #includes with
"src/gpu/v1/SurfaceDrawContext_v1.h" and reorders
replaces "class GrSurfaceDrawContext;" with
"namespace skgpu { namespace v1 { class SurfaceDrawContext; }}"
replaces "GrSurfaceDrawContext*" with "auto" where possible
replaces "rtc" with "sdc"
replaces "surfaceDrawContext" with "sdc"
replaces GrSurfaceDrawContext with skgpu::v1::SurfaceDrawContext
reflows parameters as needed
This CL does not try to:
make skgpu::v1::SurfaceDrawContext V1-only
minimize the skgpu and/or skgpu::v1 prefixes
Those two tasks will be accomplished in follow up CLs. This CL is just trying to get the bulk of the mechanical changes comprehensibly landed.
Bug: skia:11837
Change-Id: I6fe59080249d585df8f5d27c6b67569cdc35842f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/433156
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
71 lines
1.9 KiB
C++
71 lines
1.9 KiB
C++
/*
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm/gm.h"
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/core/SkFont.h"
|
|
#include "include/core/SkPaint.h"
|
|
#include "include/core/SkRect.h"
|
|
#include "include/core/SkScalar.h"
|
|
#include "include/core/SkSize.h"
|
|
#include "include/core/SkString.h"
|
|
#include "include/core/SkTextBlob.h"
|
|
#include "include/core/SkTypeface.h"
|
|
#include "include/gpu/GrDirectContext.h"
|
|
#include "tools/ToolUtils.h"
|
|
|
|
#include <string.h>
|
|
|
|
// This tests that we correctly regenerate textblobs after freeing all gpu resources crbug/491350
|
|
namespace skiagm {
|
|
class TextBlobUseAfterGpuFree : public GM {
|
|
public:
|
|
TextBlobUseAfterGpuFree() { }
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
return SkString("textblobuseaftergpufree");
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(kWidth, kHeight);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
auto dContext = GrAsDirectContext(canvas->recordingContext());
|
|
|
|
const char text[] = "Hamburgefons";
|
|
|
|
SkFont font(ToolUtils::create_portable_typeface(), 20);
|
|
auto blob = SkTextBlob::MakeFromText(text, strlen(text), font);
|
|
|
|
// draw textblob
|
|
SkRect rect = SkRect::MakeLTRB(0.f, 0.f, SkIntToScalar(kWidth), kHeight / 2.f);
|
|
SkPaint rectPaint;
|
|
rectPaint.setColor(0xffffffff);
|
|
canvas->drawRect(rect, rectPaint);
|
|
canvas->drawTextBlob(blob, 20, 60, SkPaint());
|
|
|
|
// This text should look fine
|
|
if (dContext) {
|
|
dContext->freeGpuResources();
|
|
}
|
|
canvas->drawTextBlob(blob, 20, 160, SkPaint());
|
|
}
|
|
|
|
private:
|
|
static constexpr int kWidth = 200;
|
|
static constexpr int kHeight = 200;
|
|
|
|
using INHERITED = GM;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_GM(return new TextBlobUseAfterGpuFree;)
|
|
} // namespace skiagm
|