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

Unified Diff: content/renderer/render_thread_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: replace use_image_external+use_texture_rectangle with a texture target 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/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7193aa71614ca3c1b1551d525a5dc4a5c3eb4a06..662a95e3587ecf6dedd9c0351793319fce438dd4 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -101,6 +101,7 @@
#include "content/renderer/service_worker/embedded_worker_dispatcher.h"
#include "content/renderer/shared_worker/embedded_shared_worker_stub.h"
#include "gin/public/debug.h"
+#include "gpu/GLES2/gl2extchromium.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_platform_file.h"
#include "ipc/mojo/ipc_channel_mojo.h"
@@ -520,7 +521,16 @@ void RenderThreadImpl::Init() {
is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy);
#endif
- use_image_external_ = command_line.HasSwitch(switches::kUseImageExternal);
+ image_texture_target_ = GL_TEXTURE_2D;
reveman 2014/12/03 15:57:19 do you need to set this here?
+ if (command_line.HasSwitch(switches::kImageTextureTarget)) {
+ std::string texture_target =
+ command_line.GetSwitchValueASCII(switches::kImageTextureTarget);
+ if (texture_target == "GL_TEXTURE_RECTANGLE_ARB") {
reveman 2014/12/03 15:57:19 I prefer "rectangle" instead of "GL_TEXTURE_RECTAN
+ image_texture_target_ = GL_TEXTURE_RECTANGLE_ARB;
+ } else if (texture_target == "GL_TEXTURE_EXTERNAL_OES") {
reveman 2014/12/03 15:57:19 "external"
+ image_texture_target_ = GL_TEXTURE_EXTERNAL_OES;
+ }
+ }
if (command_line.HasSwitch(switches::kDisableLCDText)) {
is_lcd_text_enabled_ = false;
« content/public/common/content_switches.cc ('K') | « content/renderer/render_thread_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698