| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #include "BenchTimer.h" | 10 #include "BenchTimer.h" |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc,
NULL, 0)); | 216 SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc,
NULL, 0)); |
| 217 if (!texture) { | 217 if (!texture) { |
| 218 return NULL; | 218 return NULL; |
| 219 } | 219 } |
| 220 device = SkNEW_ARGS(SkGpuDevice, (context, texture.get())); | 220 device = SkNEW_ARGS(SkGpuDevice, (context, texture.get())); |
| 221 break; | 221 break; |
| 222 } | 222 } |
| 223 #endif | 223 #endif |
| 224 case kPDF_Backend: | 224 case kPDF_Backend: |
| 225 default: | 225 default: |
| 226 SkASSERT(!"unsupported"); | 226 SkDEBUGFAIL("unsupported"); |
| 227 } | 227 } |
| 228 return device; | 228 return device; |
| 229 } | 229 } |
| 230 | 230 |
| 231 #if SK_SUPPORT_GPU | 231 #if SK_SUPPORT_GPU |
| 232 GrContextFactory gContextFactory; | 232 GrContextFactory gContextFactory; |
| 233 typedef GrContextFactory::GLContextType GLContextType; | 233 typedef GrContextFactory::GLContextType GLContextType; |
| 234 static const GLContextType kDontCareGLCtxType = GrContextFactory::kNative_GLCont
extType; | 234 static const GLContextType kDontCareGLCtxType = GrContextFactory::kNative_GLCont
extType; |
| 235 #else | 235 #else |
| 236 typedef int GLContextType; | 236 typedef int GLContextType; |
| (...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 966 } | 966 } |
| 967 | 967 |
| 968 return 0; | 968 return 0; |
| 969 } | 969 } |
| 970 | 970 |
| 971 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) | 971 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL) |
| 972 int main(int argc, char * const argv[]) { | 972 int main(int argc, char * const argv[]) { |
| 973 return tool_main(argc, (char**) argv); | 973 return tool_main(argc, (char**) argv); |
| 974 } | 974 } |
| 975 #endif | 975 #endif |
| OLD | NEW |