| 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> |
| 11 | 11 |
| 12 #include "base/debug/trace_event.h" | 12 #include "base/debug/trace_event.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "ui/gl/gl_surface_nsview.h" | 14 #include "ui/gl/gl_surface_nsview.h" |
| 15 | 15 |
| 16 namespace gfx { | 16 namespace gfx { |
| 17 | 17 |
| 18 GLContextNSView::GLContextNSView(GLShareGroup* group) | 18 GLContextNSView::GLContextNSView(GLShareGroup* group) |
| 19 : GLContext(group) { | 19 : GLContextReal(group) { |
| 20 } | 20 } |
| 21 | 21 |
| 22 GLContextNSView::~GLContextNSView() { | 22 GLContextNSView::~GLContextNSView() { |
| 23 } | 23 } |
| 24 | 24 |
| 25 bool GLContextNSView::Initialize(GLSurface* surface, | 25 bool GLContextNSView::Initialize(GLSurface* surface, |
| 26 GpuPreference gpu_preference) { | 26 GpuPreference gpu_preference) { |
| 27 DCHECK(!context_) << "NSGLContext was previously initialized."; | 27 DCHECK(!context_) << "NSGLContext was previously initialized."; |
| 28 gpu_preference_ = gpu_preference; | 28 gpu_preference_ = gpu_preference; |
| 29 | 29 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 57 bool GLContextNSView::MakeCurrent(GLSurface* surface) { | 57 bool GLContextNSView::MakeCurrent(GLSurface* surface) { |
| 58 TRACE_EVENT0("gpu", "GLContextNSView::MakeCurrent"); | 58 TRACE_EVENT0("gpu", "GLContextNSView::MakeCurrent"); |
| 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 SetCurrent(surface); | 68 SetCurrent(surface); |
| 68 | 69 |
| 69 if (!surface->OnMakeCurrent(this)) { | 70 if (!surface->OnMakeCurrent(this)) { |
| 70 LOG(ERROR) << "Unable to make gl context current."; | 71 LOG(ERROR) << "Unable to make gl context current."; |
| 71 return false; | 72 return false; |
| 72 } | 73 } |
| 73 | 74 |
| 74 return true; | 75 return true; |
| 75 } | 76 } |
| 76 | 77 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 90 DCHECK(interval == 0 || interval == 1); | 91 DCHECK(interval == 0 || interval == 1); |
| 91 GLint swap = interval; | 92 GLint swap = interval; |
| 92 [context_ setValues:&swap forParameter:NSOpenGLCPSwapInterval]; | 93 [context_ setValues:&swap forParameter:NSOpenGLCPSwapInterval]; |
| 93 } | 94 } |
| 94 | 95 |
| 95 void GLContextNSView::FlushBuffer() { | 96 void GLContextNSView::FlushBuffer() { |
| 96 [context_ flushBuffer]; | 97 [context_ flushBuffer]; |
| 97 } | 98 } |
| 98 | 99 |
| 99 } // namespace gfx | 100 } // namespace gfx |
| OLD | NEW |