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 "ui/gl/gl_context_nsview.h" | 5 #include "ui/gl/gl_context_nsview.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #import <AppKit/NSOpenGL.h> | 9 #import <AppKit/NSOpenGL.h> |
10 #import <AppKit/NSView.h> | 10 #import <AppKit/NSView.h> |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 AcceleratedWidget view = | 59 AcceleratedWidget view = |
60 static_cast<AcceleratedWidget>(surface->GetHandle()); | 60 static_cast<AcceleratedWidget>(surface->GetHandle()); |
61 // Only set the context's view if the view is parented. | 61 // Only set the context's view if the view is parented. |
62 // I.e. it is a valid drawable. | 62 // I.e. it is a valid drawable. |
63 if ([view window]) | 63 if ([view window]) |
64 [context_ setView:view]; | 64 [context_ setView:view]; |
65 [context_ makeCurrentContext]; | 65 [context_ makeCurrentContext]; |
66 | 66 |
67 SetRealGLApi(); | 67 SetRealGLApi(); |
68 SetCurrent(surface); | 68 SetCurrent(surface); |
| 69 if (!InitializeDynamicBindings()) { |
| 70 ReleaseCurrent(surface); |
| 71 return false; |
| 72 } |
69 | 73 |
70 if (!surface->OnMakeCurrent(this)) { | 74 if (!surface->OnMakeCurrent(this)) { |
71 LOG(ERROR) << "Unable to make gl context current."; | 75 LOG(ERROR) << "Unable to make gl context current."; |
72 return false; | 76 return false; |
73 } | 77 } |
74 | 78 |
75 return true; | 79 return true; |
76 } | 80 } |
77 | 81 |
78 void GLContextNSView::ReleaseCurrent(GLSurface* surface) { | 82 void GLContextNSView::ReleaseCurrent(GLSurface* surface) { |
(...skipping 12 matching lines...) Expand all Loading... |
91 DCHECK(interval == 0 || interval == 1); | 95 DCHECK(interval == 0 || interval == 1); |
92 GLint swap = interval; | 96 GLint swap = interval; |
93 [context_ setValues:&swap forParameter:NSOpenGLCPSwapInterval]; | 97 [context_ setValues:&swap forParameter:NSOpenGLCPSwapInterval]; |
94 } | 98 } |
95 | 99 |
96 void GLContextNSView::FlushBuffer() { | 100 void GLContextNSView::FlushBuffer() { |
97 [context_ flushBuffer]; | 101 [context_ flushBuffer]; |
98 } | 102 } |
99 | 103 |
100 } // namespace gfx | 104 } // namespace gfx |
OLD | NEW |