aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode
diff options
context:
space:
mode:
authorGravatar jvanverth <jvanverth@google.com>2015-10-02 10:42:36 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-02 10:42:36 -0700
commit41518ebc82152720b15768ee509d299bcd203b47 (patch)
treece1a8eb5e4a13e474e9278eee0e65211af8fdc29 /samplecode
parent0737f61f23ff9f0f50e982cfa260e1d10c9d6232 (diff)
Fix CrOS SampleApp
Add compile-time check for GPU build when using GPU flag TBR=robertphillips@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1376423004
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/SampleApp.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index c891508329..9be7567ea0 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -800,10 +800,12 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
#endif
fDeviceType = kRaster_DeviceType;
+#if SK_SUPPORT_GPU
if (FLAGS_gpu) {
fDeviceType = kGPU_DeviceType;
}
-
+#endif
+
#if DEFAULT_TO_GPU
fDeviceType = kGPU_DeviceType;
#endif