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

Side by Side Diff: gpu/ipc/service/image_transport_surface_android.cc

Issue 2629633003: Refactor GL bindings so there is no global GLApi or DriverGL. (Closed)
Patch Set: rebase Created 3 years, 10 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
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 "gpu/ipc/service/image_transport_surface.h" 5 #include "gpu/ipc/service/image_transport_surface.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "gpu/ipc/common/gpu_surface_lookup.h" 8 #include "gpu/ipc/common/gpu_surface_lookup.h"
9 #include "gpu/ipc/service/pass_through_image_transport_surface.h" 9 #include "gpu/ipc/service/pass_through_image_transport_surface.h"
10 #include "ui/gl/gl_surface_egl.h" 10 #include "ui/gl/gl_surface_egl.h"
11 #include "ui/gl/gl_surface_stub.h" 11 #include "ui/gl/gl_surface_stub.h"
12 12
13 namespace gpu { 13 namespace gpu {
14 14
15 // static 15 // static
16 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface( 16 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(
17 base::WeakPtr<ImageTransportSurfaceDelegate> delegate, 17 base::WeakPtr<ImageTransportSurfaceDelegate> delegate,
18 SurfaceHandle surface_handle, 18 SurfaceHandle surface_handle,
19 gl::GLSurfaceFormat format) { 19 gl::GLSurfaceFormat format) {
20 if (gl::GetGLImplementation() == gl::kGLImplementationMockGL) 20 if (gl::GetGLImplementation() == gl::kGLImplementationMockGL ||
21 gl::GetGLImplementation() == gl::kGLImplementationStubGL)
21 return new gl::GLSurfaceStub; 22 return new gl::GLSurfaceStub;
22 DCHECK(GpuSurfaceLookup::GetInstance()); 23 DCHECK(GpuSurfaceLookup::GetInstance());
23 DCHECK_NE(surface_handle, kNullSurfaceHandle); 24 DCHECK_NE(surface_handle, kNullSurfaceHandle);
24 // On Android, the surface_handle is the id of the surface in the 25 // On Android, the surface_handle is the id of the surface in the
25 // GpuSurfaceTracker/GpuSurfaceLookup 26 // GpuSurfaceTracker/GpuSurfaceLookup
26 ANativeWindow* window = 27 ANativeWindow* window =
27 GpuSurfaceLookup::GetInstance()->AcquireNativeWidget(surface_handle); 28 GpuSurfaceLookup::GetInstance()->AcquireNativeWidget(surface_handle);
28 if (!window) { 29 if (!window) {
29 LOG(WARNING) << "Failed to acquire native widget."; 30 LOG(WARNING) << "Failed to acquire native widget.";
30 return nullptr; 31 return nullptr;
31 } 32 }
32 scoped_refptr<gl::GLSurface> surface = new gl::NativeViewGLSurfaceEGL(window); 33 scoped_refptr<gl::GLSurface> surface = new gl::NativeViewGLSurfaceEGL(window);
33 bool initialize_success = surface->Initialize(format); 34 bool initialize_success = surface->Initialize(format);
34 ANativeWindow_release(window); 35 ANativeWindow_release(window);
35 if (!initialize_success) 36 if (!initialize_success)
36 return scoped_refptr<gl::GLSurface>(); 37 return scoped_refptr<gl::GLSurface>();
37 38
38 return scoped_refptr<gl::GLSurface>( 39 return scoped_refptr<gl::GLSurface>(
39 new PassThroughImageTransportSurface(delegate, surface.get())); 40 new PassThroughImageTransportSurface(delegate, surface.get()));
40 } 41 }
41 42
42 } // namespace gpu 43 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/ipc/service/gpu_command_buffer_stub.cc ('k') | gpu/ipc/service/image_transport_surface_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698