| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2016 Google Inc. | 2 * Copyright 2016 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "Viewer.h" | 8 #include "Viewer.h" |
| 9 | 9 |
| 10 #include "GMSlide.h" | 10 #include "GMSlide.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 DEFINE_string2(match, m, nullptr, | 46 DEFINE_string2(match, m, nullptr, |
| 47 "[~][^]substring[$] [...] of bench name to run.\n" | 47 "[~][^]substring[$] [...] of bench name to run.\n" |
| 48 "Multiple matches may be separated by spaces.\n" | 48 "Multiple matches may be separated by spaces.\n" |
| 49 "~ causes a matching bench to always be skipped\n" | 49 "~ causes a matching bench to always be skipped\n" |
| 50 "^ requires the start of the bench to match\n" | 50 "^ requires the start of the bench to match\n" |
| 51 "$ requires the end of the bench to match\n" | 51 "$ requires the end of the bench to match\n" |
| 52 "^ and $ requires an exact match\n" | 52 "^ and $ requires an exact match\n" |
| 53 "If a bench does not match any list entry,\n" | 53 "If a bench does not match any list entry,\n" |
| 54 "it is skipped unless some list entry starts with ~"); | 54 "it is skipped unless some list entry starts with ~"); |
| 55 DEFINE_string(skps, "skps", "Directory to read skps from."); | 55 DEFINE_string(skps, "skps", "Directory to read skps from."); |
| 56 #ifdef SK_BUILD_FOR_ANDROID |
| 57 DEFINE_bool(vulkan, false, "Run with Vulkan."); |
| 58 #else |
| 56 DEFINE_bool(vulkan, true, "Run with Vulkan."); | 59 DEFINE_bool(vulkan, true, "Run with Vulkan."); |
| 60 #endif |
| 57 | 61 |
| 58 const char *kBackendTypeStrings[sk_app::Window::kBackendTypeCount] = { | 62 const char *kBackendTypeStrings[sk_app::Window::kBackendTypeCount] = { |
| 59 " [OpenGL]", | 63 " [OpenGL]", |
| 60 " [Vulkan]", | 64 " [Vulkan]", |
| 61 " [Raster]" | 65 " [Raster]" |
| 62 }; | 66 }; |
| 63 | 67 |
| 64 const char* kName = "name"; | 68 const char* kName = "name"; |
| 65 const char* kValue = "value"; | 69 const char* kValue = "value"; |
| 66 const char* kOptions = "options"; | 70 const char* kOptions = "options"; |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 } | 505 } |
| 502 } else if (stateName.equals(kSoftkeyStateName)) { | 506 } else if (stateName.equals(kSoftkeyStateName)) { |
| 503 if (!stateValue.equals(kSoftkeyHint)) { | 507 if (!stateValue.equals(kSoftkeyHint)) { |
| 504 fCommands.onSoftkey(stateValue); | 508 fCommands.onSoftkey(stateValue); |
| 505 updateUIState(); // This is still needed to reset the value to kSoft
keyHint | 509 updateUIState(); // This is still needed to reset the value to kSoft
keyHint |
| 506 } | 510 } |
| 507 } else { | 511 } else { |
| 508 SkDebugf("Unknown stateName: %s", stateName.c_str()); | 512 SkDebugf("Unknown stateName: %s", stateName.c_str()); |
| 509 } | 513 } |
| 510 } | 514 } |
| OLD | NEW |