| 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 "GrGpuFactory.h" | 10 #include "GrGpuFactory.h" | 
| 11 | 11 | 
| 12 #include "GrGpu.h" | 12 #include "GrGpu.h" | 
| 13 #include "gl/GrGLConfig.h" | 13 #include "gl/GrGLConfig.h" | 
| 14 #include "gl/GrGLGpu.h" | 14 #include "gl/GrGLGpu.h" | 
| 15 | 15 | 
| 16 static const int kMaxNumBackends = 4; | 16 static const int kMaxNumBackends = 4; | 
| 17 static CreateGpuProc gGpuFactories[kMaxNumBackends] = {GrGLGpu::Create, NULL, NU
    LL, NULL}; | 17 static CreateGpuProc gGpuFactories[kMaxNumBackends] = {GrGLGpu::Create, NULL, NU
    LL, NULL}; | 
| 18 | 18 | 
| 19 GrGpuFactoryRegistrar::GrGpuFactoryRegistrar(int i, CreateGpuProc proc) { | 19 GrGpuFactoryRegistrar::GrGpuFactoryRegistrar(int i, CreateGpuProc proc) { | 
| 20     gGpuFactories[i] = proc; | 20     gGpuFactories[i] = proc; | 
| 21 } | 21 } | 
| 22 | 22 | 
| 23 GrGpu* GrGpu::Create(GrBackend backend, GrBackendContext backendContext, GrConte
    xt* context) { | 23 GrGpu* GrGpu::Create(GrBackend backend, | 
|  | 24                      GrBackendContext backendContext, | 
|  | 25                      const GrContextOptions& options, | 
|  | 26                      GrContext* context) { | 
| 24     SkASSERT((int)backend < kMaxNumBackends); | 27     SkASSERT((int)backend < kMaxNumBackends); | 
| 25     if (!gGpuFactories[backend]) { | 28     if (!gGpuFactories[backend]) { | 
| 26         return NULL; | 29         return NULL; | 
| 27     } | 30     } | 
| 28     return (gGpuFactories[backend])(backendContext, context); | 31     return (gGpuFactories[backend])(backendContext, options, context); | 
| 29 } | 32 } | 
| OLD | NEW | 
|---|