OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 5 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" |
6 | 6 |
7 #include "third_party/khronos/GLES2/gl2.h" | 7 #include "third_party/khronos/GLES2/gl2.h" |
8 #ifndef GL_GLEXT_PROTOTYPES | 8 #ifndef GL_GLEXT_PROTOTYPES |
9 #define GL_GLEXT_PROTOTYPES 1 | 9 #define GL_GLEXT_PROTOTYPES 1 |
10 #endif | 10 #endif |
(...skipping 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1314 | 1314 |
1315 DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT, | 1315 DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT, |
1316 FramebufferTexture2DMultisampleEXT, | 1316 FramebufferTexture2DMultisampleEXT, |
1317 WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint, WGC3Dsizei) | 1317 WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint, WGC3Dsizei) |
1318 | 1318 |
1319 DELEGATE_TO_GL_5(renderbufferStorageMultisampleEXT, | 1319 DELEGATE_TO_GL_5(renderbufferStorageMultisampleEXT, |
1320 RenderbufferStorageMultisampleEXT, WGC3Denum, WGC3Dsizei, | 1320 RenderbufferStorageMultisampleEXT, WGC3Denum, WGC3Dsizei, |
1321 WGC3Denum, WGC3Dsizei, WGC3Dsizei) | 1321 WGC3Denum, WGC3Dsizei, WGC3Dsizei) |
1322 | 1322 |
1323 GrGLInterface* WebGraphicsContext3DCommandBufferImpl::createGrGLInterface() { | 1323 GrGLInterface* WebGraphicsContext3DCommandBufferImpl::createGrGLInterface() { |
| 1324 makeContextCurrent(); |
1324 return skia_bindings::CreateCommandBufferSkiaGLBinding(); | 1325 return skia_bindings::CreateCommandBufferSkiaGLBinding(); |
1325 } | 1326 } |
1326 | 1327 |
1327 namespace { | 1328 namespace { |
1328 | 1329 |
1329 WGC3Denum convertReason(gpu::error::ContextLostReason reason) { | 1330 WGC3Denum convertReason(gpu::error::ContextLostReason reason) { |
1330 switch (reason) { | 1331 switch (reason) { |
1331 case gpu::error::kGuilty: | 1332 case gpu::error::kGuilty: |
1332 return GL_GUILTY_CONTEXT_RESET_ARB; | 1333 return GL_GUILTY_CONTEXT_RESET_ARB; |
1333 case gpu::error::kInnocent: | 1334 case gpu::error::kInnocent: |
(...skipping 24 matching lines...) Expand all Loading... |
1358 | 1359 |
1359 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( | 1360 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( |
1360 const std::string& message, int id) { | 1361 const std::string& message, int id) { |
1361 if (error_message_callback_) { | 1362 if (error_message_callback_) { |
1362 blink::WebString str = blink::WebString::fromUTF8(message.c_str()); | 1363 blink::WebString str = blink::WebString::fromUTF8(message.c_str()); |
1363 error_message_callback_->onErrorMessage(str, id); | 1364 error_message_callback_->onErrorMessage(str, id); |
1364 } | 1365 } |
1365 } | 1366 } |
1366 | 1367 |
1367 } // namespace content | 1368 } // namespace content |
OLD | NEW |