diff options
| author | erikchen <erikchen@chromium.org> | 2016-03-24 21:37:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 04:40:20 +0000 |
| commit | 4d8dc295cccc146320088799dd9af2f90d71232d (patch) | |
| tree | e8bfc09d0e96de6b376d6e5340668a2ae89b2ed5 /content | |
| parent | ded7b6ba488f2163e9588573cbb5e705222b9205 (diff) | |
| download | chromium_src-4d8dc295cccc146320088799dd9af2f90d71232d.zip chromium_src-4d8dc295cccc146320088799dd9af2f90d71232d.tar.gz chromium_src-4d8dc295cccc146320088799dd9af2f90d71232d.tar.bz2 | |
Clean up calls to CreateGpuMemoryBufferImageCHROMIUM.
This CL should not induce any behavior changes.
IOSurfaces expect a format of GL_BGRA, and an internal format of GL_RGBA.
Callers of CreateGpuMemoryBufferImageCHROMIUM were incorrectly passing in
GL_BGRA as |internalformat|, and the implementation of
CreateGpuMemoryBufferImageCHROMIUM was incorrectly allowing this. This CL
updates callsites to pass in GL_RGBA, and updates the implementation of
CreateGpuMemoryBufferImageCHROMIUM to not accept GL_BGRA.
BUG=595948
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1832923002
Cr-Commit-Position: refs/heads/master@{#383243}
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/compositor/gpu_process_transport_factory.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc index 01dcecd..f0bdc4d4 100644 --- a/content/browser/compositor/gpu_process_transport_factory.cc +++ b/content/browser/compositor/gpu_process_transport_factory.cc @@ -342,7 +342,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( GLenum format = GL_RGB; #if defined(OS_MACOSX) target = GL_TEXTURE_RECTANGLE_ARB; - format = GL_BGRA_EXT; + format = GL_RGBA; #endif surface = make_scoped_ptr(new GpuSurfacelessBrowserCompositorOutputSurface( |