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 #include "gl/SkGLContext.h" | 9 #include "gl/SkGLContext.h" |
10 | 10 |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 SkDebugf("Could not create GL interface.\n"); | 120 SkDebugf("Could not create GL interface.\n"); |
121 this->destroyGLContext(); | 121 this->destroyGLContext(); |
122 return; | 122 return; |
123 } | 123 } |
124 if (!gl->validate()) { | 124 if (!gl->validate()) { |
125 SkDebugf("Could not validate GL interface.\n"); | 125 SkDebugf("Could not validate GL interface.\n"); |
126 this->destroyGLContext(); | 126 this->destroyGLContext(); |
127 return; | 127 return; |
128 } | 128 } |
129 | 129 |
130 this->init(gl.detach()); | 130 this->init(gl.release()); |
131 } | 131 } |
132 | 132 |
133 WinGLContext::~WinGLContext() { | 133 WinGLContext::~WinGLContext() { |
134 this->teardown(); | 134 this->teardown(); |
135 this->destroyGLContext(); | 135 this->destroyGLContext(); |
136 } | 136 } |
137 | 137 |
138 void WinGLContext::destroyGLContext() { | 138 void WinGLContext::destroyGLContext() { |
139 SkSafeSetNull(fPbufferContext); | 139 SkSafeSetNull(fPbufferContext); |
140 if (fGlRenderContext) { | 140 if (fGlRenderContext) { |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 return nullptr; | 193 return nullptr; |
194 } | 194 } |
195 WinGLContext* ctx = new WinGLContext(forcedGpuAPI); | 195 WinGLContext* ctx = new WinGLContext(forcedGpuAPI); |
196 if (!ctx->isValid()) { | 196 if (!ctx->isValid()) { |
197 delete ctx; | 197 delete ctx; |
198 return nullptr; | 198 return nullptr; |
199 } | 199 } |
200 return ctx; | 200 return ctx; |
201 } | 201 } |
202 | 202 |
OLD | NEW |