diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-10-27 21:34:04 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-27 21:34:15 +0000 |
| commit | 142d4e9c313fd0b9aaec777ecf10693ac8947870 (patch) | |
| tree | d8df86a9056e69654058da54c257e58a463a00ea /samplecode | |
| parent | 2111633dc63a5b7c629b4cc33f7c67d27e1246e6 (diff) | |
Revert "Add SampleApp support to GN-win"
This reverts commit a70558e2bb161838b04bdddb5fdac7293ec33f7c.
Reason for revert:
cmd /c c:\b\s\w\ireutzd9\t\depot_tools\win_toolchain\vs_files\95ddda401ec5678f15eeed01d2bee08fcbc5ee97/win_sdk/bin/SetEnv.cmd /x86 && c:\b\s\w\ireutzd9\t\depot_tools\win_toolchain\vs_files\95ddda401ec5678f15eeed01d2bee08fcbc5ee97/VC/bin/amd64_x86/cl.exe /nologo /showIncludes /FC @obj/samplecode/SampleApp.SampleApp.obj.rsp /c ../../../samplecode/SampleApp.cpp /Foobj/samplecode/SampleApp.SampleApp.obj /Fd"obj/SampleApp_c.pdb"
c:\b\work\skia\include\views\skoswindow_win.h(18): fatal error C1083: Cannot open include file: 'EGL/egl.h': No such file or directory
I think this is restricted to just 32-bit Windows builds?
Original change's description:
> 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>
>
TBR=mtklein@chromium.org,mtklein@google.com,jvanverth@google.com,caryclark@google.com,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Iba39bab6d3a07a437a86343599e51485d8f4ce93
Reviewed-on: https://skia-review.googlesource.com/4070
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleApp.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 6f0e95842e..20a1969d88 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -730,8 +730,9 @@ 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(startgpu, false, "Start up with gpu?"); +DEFINE_bool(gpu, 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 @@ -851,7 +852,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev fDeviceType = kRaster_DeviceType; #if SK_SUPPORT_GPU - if (FLAGS_startgpu) { + if (FLAGS_gpu) { fDeviceType = kGPU_DeviceType; } #endif @@ -1613,7 +1614,7 @@ static sk_sp<SkColorSpace> getMonitorColorSpace() { if (dc) { char icmPath[MAX_PATH + 1]; DWORD pathLength = MAX_PATH; - BOOL success = GetICMProfileA(dc, &pathLength, icmPath); + BOOL success = GetICMProfile(dc, &pathLength, icmPath); DeleteDC(dc); if (success) { sk_sp<SkData> iccData = SkData::MakeFromFileName(icmPath); |