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

Unified Diff: content/renderer/pepper/ppb_graphics_3d_impl.cc

Issue 2632903002: gpu: Pepper3DImageChromium support on ChromeOS. (Closed)
Patch Set: Created 3 years, 11 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
Index: content/renderer/pepper/ppb_graphics_3d_impl.cc
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc
index e9e17ffe5006242f3181298fbcc6a68ecdd74bc3..94a39d483ef9a13a4adf3bfe9636978e85f3a4ae 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.cc
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
@@ -50,7 +50,7 @@ PPB_Graphics3D_Impl::PPB_Graphics3D_Impl(PP_Instance instance)
has_alpha_(false),
use_image_chromium_(false),
weak_ptr_factory_(this) {
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
Daniele Castagna 2017/01/14 22:55:49 Can you we remove the ifdef here now that the feat
reveman 2017/01/14 23:23:46 Done.
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
bool use_image_chromium =
!command_line->HasSwitch(switches::kDisablePepper3DImageChromium);
@@ -190,10 +190,14 @@ int32_t PPB_Graphics3D_Impl::DoSwapBuffers(const gpu::SyncToken& sync_token,
// Don't need to check for NULL from GetPluginInstance since when we're
// bound, we know our instance is valid.
bool is_overlay_candidate = use_image_chromium_;
- GLenum target =
- is_overlay_candidate ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D;
- cc::TextureMailbox texture_mailbox(taken_front_buffer_, sync_token, target,
- size, is_overlay_candidate, false);
+ cc::TextureMailbox texture_mailbox(
+ taken_front_buffer_, sync_token,
+#if defined(OS_MACOSX)
+ use_image_chromium_ ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D,
+#else
+ use_image_chromium_ ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D,
Daniele Castagna 2017/01/14 22:55:49 Should this be elif CHROME_OS? Can we add a todo:
reveman 2017/01/14 23:23:46 Done. Avoiding the CHROMEOS ifdef as TEXTURE_EXTER
+#endif
+ size, is_overlay_candidate, false);
taken_front_buffer_.SetZero();
HostGlobals::Get()
->GetInstance(pp_instance())

Powered by Google App Engine
This is Rietveld 408576698