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

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

Issue 2037793002: Move GLContext creation from //ui/gl to //ui/gl/init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gl_init
Patch Set: Change to scoped_refptr. Created 4 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
« no previous file with comments | « ui/gl/gl_context_x11.cc ('k') | ui/gl/init/BUILD.gn » ('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_surface_egl.h" 5 #include "ui/gl/gl_surface_egl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/message_loop/message_loop.h" 17 #include "base/message_loop/message_loop.h"
18 #include "base/metrics/histogram_macros.h" 18 #include "base/metrics/histogram_macros.h"
19 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
20 #include "base/sys_info.h" 20 #include "base/sys_info.h"
21 #include "base/trace_event/trace_event.h" 21 #include "base/trace_event/trace_event.h"
22 #include "build/build_config.h" 22 #include "build/build_config.h"
23 #include "ui/gfx/geometry/rect.h" 23 #include "ui/gfx/geometry/rect.h"
24 #include "ui/gl/egl_util.h" 24 #include "ui/gl/egl_util.h"
25 #include "ui/gl/gl_context.h" 25 #include "ui/gl/gl_context.h"
26 #include "ui/gl/gl_context_egl.h"
26 #include "ui/gl/gl_image.h" 27 #include "ui/gl/gl_image.h"
27 #include "ui/gl/gl_implementation.h" 28 #include "ui/gl/gl_implementation.h"
28 #include "ui/gl/gl_surface_stub.h" 29 #include "ui/gl/gl_surface_stub.h"
29 #include "ui/gl/gl_switches.h" 30 #include "ui/gl/gl_switches.h"
30 #include "ui/gl/scoped_make_current.h" 31 #include "ui/gl/scoped_make_current.h"
31 #include "ui/gl/sync_control_vsync_provider.h" 32 #include "ui/gl/sync_control_vsync_provider.h"
32 33
33 #if defined(OS_ANDROID) 34 #if defined(OS_ANDROID)
34 #include <android/native_window_jni.h> 35 #include <android/native_window_jni.h>
35 #endif 36 #endif
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 DCHECK(!g_egl_surfaceless_context_supported); 482 DCHECK(!g_egl_surfaceless_context_supported);
482 #else 483 #else
483 // Check if SurfacelessEGL is supported. 484 // Check if SurfacelessEGL is supported.
484 g_egl_surfaceless_context_supported = 485 g_egl_surfaceless_context_supported =
485 HasEGLExtension("EGL_KHR_surfaceless_context"); 486 HasEGLExtension("EGL_KHR_surfaceless_context");
486 if (g_egl_surfaceless_context_supported) { 487 if (g_egl_surfaceless_context_supported) {
487 // EGL_KHR_surfaceless_context is supported but ensure 488 // EGL_KHR_surfaceless_context is supported but ensure
488 // GL_OES_surfaceless_context is also supported. We need a current context 489 // GL_OES_surfaceless_context is also supported. We need a current context
489 // to query for supported GL extensions. 490 // to query for supported GL extensions.
490 scoped_refptr<GLSurface> surface = new SurfacelessEGL(gfx::Size(1, 1)); 491 scoped_refptr<GLSurface> surface = new SurfacelessEGL(gfx::Size(1, 1));
491 scoped_refptr<GLContext> context = GLContext::CreateGLContext( 492 scoped_refptr<GLContext> context = InitializeGLContext(
492 NULL, surface.get(), PreferIntegratedGpu); 493 new GLContextEGL(nullptr), surface.get(), PreferIntegratedGpu);
493 if (!context->MakeCurrent(surface.get())) 494 if (!context->MakeCurrent(surface.get()))
494 g_egl_surfaceless_context_supported = false; 495 g_egl_surfaceless_context_supported = false;
495 496
496 // Ensure context supports GL_OES_surfaceless_context. 497 // Ensure context supports GL_OES_surfaceless_context.
497 if (g_egl_surfaceless_context_supported) { 498 if (g_egl_surfaceless_context_supported) {
498 g_egl_surfaceless_context_supported = context->HasExtension( 499 g_egl_surfaceless_context_supported = context->HasExtension(
499 "GL_OES_surfaceless_context"); 500 "GL_OES_surfaceless_context");
500 context->ReleaseCurrent(surface.get()); 501 context->ReleaseCurrent(surface.get());
501 } 502 }
502 } 503 }
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 } 1125 }
1125 1126
1126 void* SurfacelessEGL::GetShareHandle() { 1127 void* SurfacelessEGL::GetShareHandle() {
1127 return NULL; 1128 return NULL;
1128 } 1129 }
1129 1130
1130 SurfacelessEGL::~SurfacelessEGL() { 1131 SurfacelessEGL::~SurfacelessEGL() {
1131 } 1132 }
1132 1133
1133 } // namespace gl 1134 } // namespace gl
OLDNEW
« no previous file with comments | « ui/gl/gl_context_x11.cc ('k') | ui/gl/init/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698