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

Side by Side Diff: ui/gl/gl_context_x11.cc

Issue 1054883004: Revert of Use the desktop GL core profile on Linux when ES3 support is requested. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « ui/gl/gl_context_glx.cc ('k') | ui/gl/gl_implementation_x11.cc » ('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.h" 5 #include "ui/gl/gl_context.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "ui/gl/gl_bindings.h" 10 #include "ui/gl/gl_bindings.h"
(...skipping 17 matching lines...) Expand all
28 GpuPreference gpu_preference) { 28 GpuPreference gpu_preference) {
29 TRACE_EVENT0("gpu", "GLContext::CreateGLContext"); 29 TRACE_EVENT0("gpu", "GLContext::CreateGLContext");
30 switch (GetGLImplementation()) { 30 switch (GetGLImplementation()) {
31 case kGLImplementationOSMesaGL: { 31 case kGLImplementationOSMesaGL: {
32 scoped_refptr<GLContext> context(new GLContextOSMesa(share_group)); 32 scoped_refptr<GLContext> context(new GLContextOSMesa(share_group));
33 if (!context->Initialize(compatible_surface, gpu_preference)) 33 if (!context->Initialize(compatible_surface, gpu_preference))
34 return NULL; 34 return NULL;
35 35
36 return context; 36 return context;
37 } 37 }
38 case kGLImplementationDesktopGL: 38 case kGLImplementationDesktopGL: {
39 case kGLImplementationDesktopGLCoreProfile: {
40 scoped_refptr<GLContext> context(new GLContextGLX(share_group)); 39 scoped_refptr<GLContext> context(new GLContextGLX(share_group));
41 if (!context->Initialize(compatible_surface, gpu_preference)) 40 if (!context->Initialize(compatible_surface, gpu_preference))
42 return NULL; 41 return NULL;
43 42
44 return context; 43 return context;
45 } 44 }
46 case kGLImplementationEGLGLES2: { 45 case kGLImplementationEGLGLES2: {
47 scoped_refptr<GLContext> context(new GLContextEGL(share_group)); 46 scoped_refptr<GLContext> context(new GLContextEGL(share_group));
48 if (!context->Initialize(compatible_surface, gpu_preference)) 47 if (!context->Initialize(compatible_surface, gpu_preference))
49 return NULL; 48 return NULL;
50 49
51 return context; 50 return context;
52 } 51 }
53 case kGLImplementationMockGL: 52 case kGLImplementationMockGL:
54 return new GLContextStub; 53 return new GLContextStub;
55 default: 54 default:
56 NOTREACHED(); 55 NOTREACHED();
57 return NULL; 56 return NULL;
58 } 57 }
59 } 58 }
60 59
61 } // namespace gfx 60 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_context_glx.cc ('k') | ui/gl/gl_implementation_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698