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

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

Issue 766663005: cc: zero/one-copy based on shared memory on IOS uses GL_TEXTURE_2D, not GL_TEXTURE_RECTANGLE_ARB. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use GLES2Util::GetStringEnum instead of kImageTextureExternal Created 6 years 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
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 e683a1d5c25baca05e0e7108628f8f031ff46f3c..09ca59d9a992f34bdee0caf29aa7b7514305803c 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -132,7 +132,9 @@
#include "content/public/common/sandboxed_process_launcher_delegate.h"
#include "content/public/common/url_constants.h"
#include "device/battery/battery_monitor_impl.h"
+#include "gpu/GLES2/gl2extchromium.h"
#include "gpu/command_buffer/client/gpu_switches.h"
+#include "gpu/command_buffer/common/gles2_cmd_utils.h"
#include "gpu/command_buffer/service/gpu_switches.h"
#include "ipc/ipc_channel.h"
#include "ipc/ipc_logging.h"
@@ -1037,9 +1039,23 @@ static void AppendCompositorCommandLineFlags(base::CommandLine* command_line) {
// The GPU service will always use the preferred type.
gfx::GpuMemoryBufferType type = supported_types[0];
- // Surface texture backed GPU memory buffers require TEXTURE_EXTERNAL_OES.
- if (type == gfx::SURFACE_TEXTURE_BUFFER)
- command_line->AppendSwitch(switches::kUseImageExternal);
+ 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;
+ }
}
// Appending disable-gpu-feature switches due to software rendering list.

Powered by Google App Engine
This is Rietveld 408576698