diff options
| author | Jim Van Verth <jvanverth@google.com> | 2016-10-27 16:17:06 -0400 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-27 20:49:51 +0000 |
| commit | a70558e2bb161838b04bdddb5fdac7293ec33f7c (patch) | |
| tree | 7a1c2e6d43fccec1f66f44c42ac08529f1b3df8d /samplecode/SampleApp.cpp | |
| parent | 693a540272a771c6b0830094c461397cb77543b1 (diff) | |
Add SampleApp support to GN-win
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4062
Change-Id: I88b10748b49adbf57f247b51eec1b9ca86377800
Reviewed-on: https://skia-review.googlesource.com/4062
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 20a1969d88..6f0e95842e 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -730,9 +730,8 @@ DEFINE_string(svgDir, "", "Read SVGs from here."); DEFINE_string(sequence, "", "Path to file containing the desired samples/gms to show."); DEFINE_bool(sort, false, "Sort samples by title."); DEFINE_bool(list, false, "List samples?"); -DEFINE_bool(gpu, false, "Start up with gpu?"); +DEFINE_bool(startgpu, false, "Start up with gpu?"); DEFINE_bool(redraw, false, "Force continuous redrawing, for profiling or debugging tools."); -DEFINE_string(key, "", ""); // dummy to enable gm tests that have platform-specific names #ifdef SAMPLE_PDF_FILE_VIEWER DEFINE_string(pdfPath, "", "Path to direcotry of pdf files."); #endif @@ -852,7 +851,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev fDeviceType = kRaster_DeviceType; #if SK_SUPPORT_GPU - if (FLAGS_gpu) { + if (FLAGS_startgpu) { fDeviceType = kGPU_DeviceType; } #endif @@ -1614,7 +1613,7 @@ static sk_sp<SkColorSpace> getMonitorColorSpace() { if (dc) { char icmPath[MAX_PATH + 1]; DWORD pathLength = MAX_PATH; - BOOL success = GetICMProfile(dc, &pathLength, icmPath); + BOOL success = GetICMProfileA(dc, &pathLength, icmPath); DeleteDC(dc); if (success) { sk_sp<SkData> iccData = SkData::MakeFromFileName(icmPath); |