OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 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 "SkCommonFlagsConfig.h" | 8 #include "SkCommonFlagsConfig.h" |
9 | 9 |
10 #include <stdlib.h> | 10 #include <stdlib.h> |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 "\t\tdebug \t\t\tUse debug OpenGL.\n" | 57 "\t\tdebug \t\t\tUse debug OpenGL.\n" |
58 "\t\tnull \t\t\tUse null OpenGL.\n" | 58 "\t\tnull \t\t\tUse null OpenGL.\n" |
59 #if SK_ANGLE | 59 #if SK_ANGLE |
60 #ifdef SK_BUILD_FOR_WIN | 60 #ifdef SK_BUILD_FOR_WIN |
61 "\t\tangle\t\t\tUse ANGLE DirectX.\n" | 61 "\t\tangle\t\t\tUse ANGLE DirectX.\n" |
62 #endif | 62 #endif |
63 "\t\tangle-gl\t\t\tUse ANGLE OpenGL.\n" | 63 "\t\tangle-gl\t\t\tUse ANGLE OpenGL.\n" |
64 #endif | 64 #endif |
65 #if SK_COMMAND_BUFFER | 65 #if SK_COMMAND_BUFFER |
66 "\t\tcommandbuffer\t\tUse command buffer.\n" | 66 "\t\tcommandbuffer\t\tUse command buffer.\n" |
| 67 "\t\tcommandbuffer3\t\tUse command buffer ES 3.0 (experimental).\n" |
67 #endif | 68 #endif |
68 #if SK_MESA | 69 #if SK_MESA |
69 "\t\tmesa\t\t\tUse MESA.\n" | 70 "\t\tmesa\t\t\tUse MESA.\n" |
70 #endif | 71 #endif |
71 "\tdit\ttype: bool\tdefault: false.\n" | 72 "\tdit\ttype: bool\tdefault: false.\n" |
72 "\t Use device independent text.\n" | 73 "\t Use device independent text.\n" |
73 "\tnvpr\ttype: bool\tdefault: false.\n" | 74 "\tnvpr\ttype: bool\tdefault: false.\n" |
74 "\t Use NV_path_rendering OpenGL and OpenGL ES extension.\n" | 75 "\t Use NV_path_rendering OpenGL and OpenGL ES extension.\n" |
75 "\tsamples\ttype: int\tdefault: 0.\n" | 76 "\tsamples\ttype: int\tdefault: 0.\n" |
76 "\t Use multisampling with N samples.\n" | 77 "\t Use multisampling with N samples.\n" |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 return true; | 208 return true; |
208 } | 209 } |
209 #endif | 210 #endif |
210 if (value.equals("angle-gl")) { | 211 if (value.equals("angle-gl")) { |
211 *outContextType = GrContextFactory::kANGLE_GL_GLContextType; | 212 *outContextType = GrContextFactory::kANGLE_GL_GLContextType; |
212 return true; | 213 return true; |
213 } | 214 } |
214 #endif | 215 #endif |
215 #if SK_COMMAND_BUFFER | 216 #if SK_COMMAND_BUFFER |
216 if (value.equals("commandbuffer")) { | 217 if (value.equals("commandbuffer")) { |
217 *outContextType = GrContextFactory::kCommandBuffer_GLContextType; | 218 *outContextType = GrContextFactory::kCommandBufferES2_GLContextType; |
| 219 return true; |
| 220 } |
| 221 if (value.equals("commandbuffer3")) { |
| 222 *outContextType = GrContextFactory::kCommandBufferES3_GLContextType; |
218 return true; | 223 return true; |
219 } | 224 } |
220 #endif | 225 #endif |
221 #if SK_MESA | 226 #if SK_MESA |
222 if (value.equals("mesa")) { | 227 if (value.equals("mesa")) { |
223 *outContextType = GrContextFactory::kMESA_GLContextType; | 228 *outContextType = GrContextFactory::kMESA_GLContextType; |
224 return true; | 229 return true; |
225 } | 230 } |
226 #endif | 231 #endif |
227 return false; | 232 return false; |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 if (extendedBackend.equals("gpu")) { | 332 if (extendedBackend.equals("gpu")) { |
328 parsedConfig = parse_command_line_config_gpu(tag, vias, extendedOpti
ons); | 333 parsedConfig = parse_command_line_config_gpu(tag, vias, extendedOpti
ons); |
329 } | 334 } |
330 #endif | 335 #endif |
331 if (!parsedConfig) { | 336 if (!parsedConfig) { |
332 parsedConfig = new SkCommandLineConfig(tag, simpleBackend, vias); | 337 parsedConfig = new SkCommandLineConfig(tag, simpleBackend, vias); |
333 } | 338 } |
334 outResult->emplace_back(parsedConfig); | 339 outResult->emplace_back(parsedConfig); |
335 } | 340 } |
336 } | 341 } |
OLD | NEW |