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

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

Issue 2632903002: gpu: Pepper3DImageChromium support on ChromeOS. (Closed)
Patch Set: remove ifdef and add todo 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
« no previous file with comments | « content/renderer/pepper/ppb_graphics_3d_impl.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..8a89b725506ec38a6004ccc4004ae7568ed99eaa 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.cc
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
@@ -48,20 +48,11 @@ PPB_Graphics3D_Impl::PPB_Graphics3D_Impl(PP_Instance instance)
bound_to_instance_(false),
commit_pending_(false),
has_alpha_(false),
- use_image_chromium_(false),
- weak_ptr_factory_(this) {
-#if defined(OS_MACOSX)
- base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
- bool use_image_chromium =
- !command_line->HasSwitch(switches::kDisablePepper3DImageChromium);
-
- if (use_image_chromium) {
- use_image_chromium =
- base::FeatureList::IsEnabled(features::kPepper3DImageChromium);
- }
- use_image_chromium_ = use_image_chromium;
-#endif
-}
+ use_image_chromium_(
+ !base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisablePepper3DImageChromium) &&
+ base::FeatureList::IsEnabled(features::kPepper3DImageChromium)),
+ weak_ptr_factory_(this) {}
PPB_Graphics3D_Impl::~PPB_Graphics3D_Impl() {
// Unset the client before the command_buffer_ is destroyed, similar to how
@@ -190,10 +181,15 @@ 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,
+// TODO(reveman): Get texture target from browser process.
+#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,
+#endif
+ size, is_overlay_candidate, false);
taken_front_buffer_.SetZero();
HostGlobals::Get()
->GetInstance(pp_instance())
« no previous file with comments | « content/renderer/pepper/ppb_graphics_3d_impl.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698