AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get HelloWorld example running again

Browse Source 
Change-Id: I5956f7c52d265d9f52dd061f1555c54ad092fe76
Reviewed-on: https://skia-review.googlesource.com/57101
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
Jim Van Verth 2017-10-09 10:16:01 -04:00 committed by Skia Commit-Bot
parent c203e65265
commit c1720d4036
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BUILD.gn
View File

@ -1421,6 +1421,26 @@ if (skia_enable_tools) {
}
}
if (skia_enable_gpu && !skia_use_angle && (is_linux || is_win || is_mac)) {
test_app("HelloWorld") {
sources = [
"example/HelloWorld.cpp",
]
if (is_mac) {
sources += [ "src/views/mac/skia_mac.mm" ]
} else if (is_win) {
sources += [ "src/views/win/skia_win.cpp" ]
} else if (is_linux) {
sources += [ "src/views/unix/skia_unix.cpp" ]
}
deps = [
":gpu_tool_utils",
":skia",
":views",
]
}
}
if (skia_enable_gpu) {
test_app("skpbench") {
sources = [

17
example/HelloWorld.cpp
View File

@ -39,14 +39,6 @@ HelloWorldWindow::~HelloWorldWindow() {
}
void HelloWorldWindow::tearDownBackend() {
SkSafeUnref(fContext);
fContext = NULL;
SkSafeUnref(fInterface);
fInterface = NULL;
fGpuSurface = nullptr;
INHERITED::release();
}
@ -67,10 +59,10 @@ bool HelloWorldWindow::setUpBackend() {
return false;
}
fInterface = GrGLCreateNativeInterface();
fInterface.reset(GrGLCreateNativeInterface());
SkASSERT(NULL != fInterface);
fContext = GrContext::MakeGL(fInterface).release();
fContext = GrContext::MakeGL(fInterface.get());
SkASSERT(NULL != fContext);
this->setUpGpuBackedSurface();
@ -78,7 +70,7 @@ bool HelloWorldWindow::setUpBackend() {
}
void HelloWorldWindow::setUpGpuBackedSurface() {
fGpuSurface = this->makeGpuBackedSurface(fAttachmentInfo, fInterface, fContext);
fGpuSurface = this->makeGpuBackedSurface(fAttachmentInfo, fInterface.get(), fContext.get());
}
void HelloWorldWindow::drawContents(SkCanvas* canvas) {
@ -114,8 +106,7 @@ void HelloWorldWindow::drawContents(SkCanvas* canvas) {
// Draw a message with a nice black paint.
paint.setFlags(
SkPaint::kAntiAlias_Flag |
SkPaint::kSubpixelText_Flag | // ... avoid waggly text when rotating.
SkPaint::kUnderlineText_Flag);
SkPaint::kSubpixelText_Flag); // ... avoid waggly text when rotating.
paint.setColor(SK_ColorBLACK);
paint.setTextSize(20);

4
example/HelloWorld.h
View File

@ -62,10 +62,10 @@ private:
// support framework
DeviceType fType;
sk_sp<SkSurface> fRasterSurface;
GrContext* fContext;
sk_sp<GrContext> fContext;
sk_sp<SkSurface> fGpuSurface;
AttachmentInfo fAttachmentInfo;
const GrGLInterface* fInterface;
sk_sp<const GrGLInterface> fInterface;
typedef SkOSWindow INHERITED;
};