| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 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 "GrGLContext.h" | 8 #include "GrGLContext.h" |
| 9 #include "GrGLGLSL.h" | 9 #include "GrGLGLSL.h" |
| 10 | 10 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 */ | 53 */ |
| 54 if (kAdreno3xx_GrGLRenderer == args.fRenderer) { | 54 if (kAdreno3xx_GrGLRenderer == args.fRenderer) { |
| 55 args.fGLSLGeneration = k110_GrGLSLGeneration; | 55 args.fGLSLGeneration = k110_GrGLSLGeneration; |
| 56 } | 56 } |
| 57 | 57 |
| 58 GrGLGetDriverInfo(interface->fStandard, args.fVendor, renderer, ver, | 58 GrGLGetDriverInfo(interface->fStandard, args.fVendor, renderer, ver, |
| 59 &args.fDriver, &args.fDriverVersion); | 59 &args.fDriver, &args.fDriverVersion); |
| 60 | 60 |
| 61 args.fContextOptions = &options; | 61 args.fContextOptions = &options; |
| 62 | 62 |
| 63 return SkNEW_ARGS(GrGLContext, (args)); | 63 return new GrGLContext(args); |
| 64 } | 64 } |
| 65 | 65 |
| 66 GrGLContextInfo::GrGLContextInfo(const ConstructorArgs& args) { | 66 GrGLContextInfo::GrGLContextInfo(const ConstructorArgs& args) { |
| 67 fInterface.reset(SkRef(args.fInterface)); | 67 fInterface.reset(SkRef(args.fInterface)); |
| 68 fGLVersion = args.fGLVersion; | 68 fGLVersion = args.fGLVersion; |
| 69 fGLSLGeneration = args.fGLSLGeneration; | 69 fGLSLGeneration = args.fGLSLGeneration; |
| 70 fVendor = args.fVendor; | 70 fVendor = args.fVendor; |
| 71 fRenderer = args.fRenderer; | 71 fRenderer = args.fRenderer; |
| 72 fDriver = args.fDriver; | 72 fDriver = args.fDriver; |
| 73 fDriverVersion = args.fDriverVersion; | 73 fDriverVersion = args.fDriverVersion; |
| 74 | 74 |
| 75 fGLCaps.reset(SkNEW_ARGS(GrGLCaps, (*args.fContextOptions, *this, fInterface
))); | 75 fGLCaps.reset(new GrGLCaps(*args.fContextOptions, *this, fInterface)); |
| 76 } | 76 } |
| OLD | NEW |