| 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 #include "gl/SkGLContext.h" | 8 #include "gl/SkGLContext.h" |
| 9 #include "AvailabilityMacros.h" | 9 #include "AvailabilityMacros.h" |
| 10 | 10 |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 GrGLFuncPtr MacGLContext::onPlatformGetProcAddress(const char* procName) const { | 103 GrGLFuncPtr MacGLContext::onPlatformGetProcAddress(const char* procName) const { |
| 104 return reinterpret_cast<GrGLFuncPtr>(dlsym(fGLLibrary, procName)); | 104 return reinterpret_cast<GrGLFuncPtr>(dlsym(fGLLibrary, procName)); |
| 105 } | 105 } |
| 106 | 106 |
| 107 } // anonymous namespace | 107 } // anonymous namespace |
| 108 | 108 |
| 109 SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) { | 109 SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI) { |
| 110 if (kGLES_GrGLStandard == forcedGpuAPI) { | 110 if (kGLES_GrGLStandard == forcedGpuAPI) { |
| 111 return NULL; | 111 return NULL; |
| 112 } | 112 } |
| 113 MacGLContext* ctx = SkNEW(MacGLContext); | 113 MacGLContext* ctx = new MacGLContext; |
| 114 if (!ctx->isValid()) { | 114 if (!ctx->isValid()) { |
| 115 SkDELETE(ctx); | 115 delete ctx; |
| 116 return NULL; | 116 return NULL; |
| 117 } | 117 } |
| 118 return ctx; | 118 return ctx; |
| 119 } | 119 } |
| OLD | NEW |