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

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 963223002: ui: Pass correct image texture target and one-copy settings to cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: usetexturetarget: exportswitch Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/browser_gpu_channel_host_factory.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index c3f6d0cb911f911b0fc2aa06bdaf49e81a52a5a4..6564c4387af6adf60c5fec2b6075833d5bbef054 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1108,33 +1108,10 @@ static void AppendCompositorCommandLineFlags(base::CommandLine* command_line) {
if (IsForceGpuRasterizationEnabled())
command_line->AppendSwitch(switches::kForceGpuRasterization);
- if (BrowserGpuChannelHostFactory::IsGpuMemoryBufferFactoryUsageEnabled(
- gfx::GpuMemoryBuffer::MAP)) {
- std::vector<gfx::GpuMemoryBufferType> supported_types;
- GpuMemoryBufferFactory::GetSupportedTypes(&supported_types);
- DCHECK(!supported_types.empty());
-
- // The GPU service will always use the preferred type.
- gfx::GpuMemoryBufferType type = supported_types[0];
-
- switch (type) {
- case gfx::SURFACE_TEXTURE_BUFFER:
- // Surface texture backed GPU memory buffers require
- // TEXTURE_EXTERNAL_OES.
- command_line->AppendSwitchASCII(
- switches::kUseImageTextureTarget,
- gpu::gles2::GLES2Util::GetStringEnum(GL_TEXTURE_EXTERNAL_OES));
- break;
- case gfx::IO_SURFACE_BUFFER:
- // IOSurface backed images require GL_TEXTURE_RECTANGLE_ARB.
- command_line->AppendSwitchASCII(
- switches::kUseImageTextureTarget,
- gpu::gles2::GLES2Util::GetStringEnum(GL_TEXTURE_RECTANGLE_ARB));
- break;
- default:
- break;
- }
- }
+ command_line->AppendSwitchASCII(
+ switches::kUseImageTextureTarget,
+ base::UintToString(
+ BrowserGpuChannelHostFactory::GetImageTextureTarget()));
// Appending disable-gpu-feature switches due to software rendering list.
GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
« no previous file with comments | « content/browser/gpu/browser_gpu_channel_host_factory.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698