Chromium Code Reviews| Index: content/renderer/render_thread_impl.cc |
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
| index 650c8e492a2ae772eec2797efdee9bccdbea86f2..f348bd1ad554f18c5a4c3fa8c527951183eae98c 100644 |
| --- a/content/renderer/render_thread_impl.cc |
| +++ b/content/renderer/render_thread_impl.cc |
| @@ -102,6 +102,8 @@ |
| #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 "gpu/command_buffer/common/gles2_cmd_utils.h" |
| #include "ipc/ipc_channel_handle.h" |
| #include "ipc/ipc_platform_file.h" |
| #include "ipc/mojo/ipc_channel_mojo.h" |
| @@ -521,7 +523,18 @@ void RenderThreadImpl::Init() { |
| is_one_copy_enabled_ = !command_line.HasSwitch(switches::kDisableOneCopy); |
| #endif |
| - use_image_external_ = command_line.HasSwitch(switches::kUseImageExternal); |
| + use_image_texture_target_ = GL_TEXTURE_2D; |
| + if (command_line.HasSwitch(switches::kUseImageTextureTarget)) { |
| + std::string texture_target = |
| + command_line.GetSwitchValueASCII(switches::kUseImageTextureTarget); |
| + if (texture_target == |
| + gpu::gles2::GLES2Util::GetStringEnum(GL_TEXTURE_RECTANGLE_ARB)) { |
| + use_image_texture_target_ = GL_TEXTURE_RECTANGLE_ARB; |
| + } else if (texture_target == |
| + gpu::gles2::GLES2Util::GetStringEnum(GL_TEXTURE_EXTERNAL_OES)) { |
| + use_image_texture_target_ = GL_TEXTURE_EXTERNAL_OES; |
| + } |
|
reveman
2014/12/04 20:10:38
Current code is fine but you might want to conside
dshwang
2014/12/04 20:55:59
nice code stub. I buy it :)
Done.
|
| + } |
| if (command_line.HasSwitch(switches::kDisableLCDText)) { |
| is_lcd_text_enabled_ = false; |