Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: ui/gl/gl_context_nsview.mm

Issue 15928002: GPU: Keep track of the last real context and real surface made current. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nix unnecessary changes. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gl/gl_context_nsview.h ('k') | ui/gl/gl_context_osmesa.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 SetCurrent(this, surface); 67 SetCurrent(surface);
68 68
69 if (!surface->OnMakeCurrent(this)) { 69 if (!surface->OnMakeCurrent(this)) {
70 LOG(ERROR) << "Unable to make gl context current."; 70 LOG(ERROR) << "Unable to make gl context current.";
71 return false; 71 return false;
72 } 72 }
73 73
74 return true; 74 return true;
75 } 75 }
76 76
77 void GLContextNSView::ReleaseCurrent(GLSurface* surface) { 77 void GLContextNSView::ReleaseCurrent(GLSurface* surface) {
(...skipping 12 matching lines...) Expand all
90 DCHECK(interval == 0 || interval == 1); 90 DCHECK(interval == 0 || interval == 1);
91 GLint swap = interval; 91 GLint swap = interval;
92 [context_ setValues:&swap forParameter:NSOpenGLCPSwapInterval]; 92 [context_ setValues:&swap forParameter:NSOpenGLCPSwapInterval];
93 } 93 }
94 94
95 void GLContextNSView::FlushBuffer() { 95 void GLContextNSView::FlushBuffer() {
96 [context_ flushBuffer]; 96 [context_ flushBuffer];
97 } 97 }
98 98
99 } // namespace gfx 99 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_context_nsview.h ('k') | ui/gl/gl_context_osmesa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698