media: Add GLES2DecoderHelper

media/gpu/gles2_decoder_helper.cc

+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/gpu/gles2_decoder_helper.h"
+
+#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "base/threading/thread_checker.h"
+#include "gpu/command_buffer/common/mailbox.h"
+#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
+#include "gpu/command_buffer/service/mailbox_manager.h"
+#include "gpu/command_buffer/service/texture_manager.h"
+
+namespace media {
+
+class GLES2DecoderHelperImpl : public GLES2DecoderHelper {
+ public:
+  explicit GLES2DecoderHelperImpl(gpu::gles2::GLES2Decoder* decoder)
+      : decoder_(decoder) {}
+
+  bool MakeContextCurrent() override {
+    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+    return decoder_->MakeCurrent();
+  }
+
+  scoped_refptr<gpu::gles2::TextureRef> CreateTexture(GLenum target,
+                                                      GLenum internal_format,
+                                                      GLsizei width,
+                                                      GLsizei height,
+                                                      GLenum format,
+                                                      GLenum type) override {
+    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);

[sunnyps, 2017/06/30 01:01:07]

nit: dcheck if context is current

[sandersd (OOO until July 31), 2017/07/06 22:09:06]

Done.

+    gpu::gles2::ContextGroup* group = decoder_->GetContextGroup();
+    if (!group)

[piman, 2017/07/06 22:30:50]

nit: This will always be non-null

+      return nullptr;
+    gpu::gles2::TextureManager* texture_manager = group->texture_manager();
+    if (!texture_manager)

[piman, 2017/07/06 22:30:50]

So, today this would never be null in production. However we have a new decoder
back-end (GLES2DecoderPassthroughImpl) that exclusively works with ANGLE which
doesn't use TextureManager, but instead uses the group's PassthroughResources.
At the same time, it doesn't use TextureRef either (it just has a client id ->
service id map)... Either way, I think GVDA and friends will need some changes
to work with it, somewhat orthogonal to this CL. Given that this function
wouldn't even make sense with that other back-end, I think I would
DCHECK(texture_manager) instead, with a TODO.

We may want to revisit this API at a higher level later on, to see how we can
make it work with both types of decoder. It could make sense to move some of the
logic onto the decoder themselves.

[sandersd (OOO until July 31), 2017/07/06 22:47:11]

Done.

In general, the purpose of VDAs is not just to be in the GPU process, but also
to have access to the platform primitives for graphics operations. Perhaps the
real answer is that we'll eventually want to move to the other side of ANGLE?

+      return nullptr;
+
+    // We can't use texture_manager->CreateTexture(), since it requires a unique
+    // |client_id|. Instead we create the texture directly, and create our own
+    // TextureRef for it.
+    GLuint texture_id;
+    glGenTextures(1, &texture_id);
+    glBindTexture(target, texture_id);
+
+    scoped_refptr<gpu::gles2::TextureRef> texture_ref =
+        gpu::gles2::TextureRef::Create(texture_manager, 0, texture_id);
+    texture_manager->SetTarget(texture_ref.get(), target);
+    texture_manager->SetLevelInfo(texture_ref.get(),  // ref
+                                  target,             // target
+                                  0,                  // level
+                                  internal_format,    // internal_format
+                                  width,              // width
+                                  height,             // height
+                                  1,                  // depth
+                                  0,                  // border
+                                  format,             // format
+                                  type,               // type
+                                  gfx::Rect());       // cleared_rect
+
+    texture_manager->SetParameteri(__func__, decoder_->GetErrorState(),
+                                   texture_ref.get(), GL_TEXTURE_MAG_FILTER,
+                                   GL_LINEAR);
+    texture_manager->SetParameteri(__func__, decoder_->GetErrorState(),
+                                   texture_ref.get(), GL_TEXTURE_MIN_FILTER,
+                                   GL_LINEAR);
+
+    texture_manager->SetParameteri(__func__, decoder_->GetErrorState(),
+                                   texture_ref.get(), GL_TEXTURE_WRAP_S,
+                                   GL_CLAMP_TO_EDGE);
+    texture_manager->SetParameteri(__func__, decoder_->GetErrorState(),
+                                   texture_ref.get(), GL_TEXTURE_WRAP_T,
+                                   GL_CLAMP_TO_EDGE);
+
+    texture_manager->SetParameteri(__func__, decoder_->GetErrorState(),
+                                   texture_ref.get(), GL_TEXTURE_BASE_LEVEL, 0);
+    texture_manager->SetParameteri(__func__, decoder_->GetErrorState(),
+                                   texture_ref.get(), GL_TEXTURE_MAX_LEVEL, 0);
+
+    // TODO(sandersd): Do we always want to allocate for GL_TEXTURE_2D?
+    if (target == GL_TEXTURE_2D) {
+      glTexImage2D(target,           // target
+                   0,                // level
+                   internal_format,  // internal_format
+                   width,            // width
+                   height,           // height
+                   0,                // border
+                   format,           // format
+                   type,             // type
+                   nullptr);         // data
+    }
+
+    decoder_->RestoreActiveTextureUnitBinding(target);
+    return texture_ref;
+  }
+
+  base::Optional<gpu::Mailbox> CreateMailbox(
+      gpu::gles2::TextureRef* texture_ref) override {
+    DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+    gpu::gles2::ContextGroup* group = decoder_->GetContextGroup();
+    if (!group)

[piman, 2017/07/06 22:30:50]

nit: ditto

[sandersd (OOO until July 31), 2017/07/06 22:47:11]

Done.

+      return base::nullopt;
+    gpu::gles2::MailboxManager* mailbox_manager = group->mailbox_manager();
+    if (!mailbox_manager)

[piman, 2017/07/06 22:30:50]

nit: also never null

Which means, you don't need to provide a failure path.

[sandersd (OOO until July 31), 2017/07/06 22:47:11]

Done.

+      return base::nullopt;
+    gpu::Mailbox mailbox = gpu::Mailbox::Generate();
+    mailbox_manager->ProduceTexture(mailbox, texture_ref->texture());
+    return mailbox;
+  }
+
+ private:
+  gpu::gles2::GLES2Decoder* decoder_;
+  THREAD_CHECKER(thread_checker_);
+
+  DISALLOW_COPY_AND_ASSIGN(GLES2DecoderHelperImpl);
+};
+
+// static
+std::unique_ptr<GLES2DecoderHelper> GLES2DecoderHelper::Create(
+    gpu::gles2::GLES2Decoder* decoder) {
+  if (!decoder)
+    return nullptr;
+  return base::MakeUnique<GLES2DecoderHelperImpl>(decoder);
+}
+
+}  // namespace media