Add GLStreamTextureImage

gpu/command_buffer/service/texture_manager.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/texture_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 10 matching lines @@
 #include "gpu/command_buffer/service/context_state.h"
 #include "gpu/command_buffer/service/error_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_state_restorer.h"
+#include "ui/gl/gl_stream_texture_image.h"

[reveman, 2016/02/18 20:20:57]

Did you forget to add this file? Btw, can this class live in gpu/command_buffer
instead of ui/gl? The stream texture concept is very command buffer specific and
not generic ui/gl code..

[liberato (no reviews please), 2016/02/19 18:39:56]

Done.

 #include "ui/gl/gl_version_info.h"
 #include "ui/gl/trace_util.h"
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
 // This should contain everything to uniquely identify a Texture.
 const char TextureTag[] = "|Texture|";
@@ skipping 1279 matching lines @@
       if (!cleared)
         return false;
     }
   }
 
   UpdateMipCleared(&info, info.width, info.height,
                    gfx::Rect(info.width, info.height));
   return true;
 }
 
-void Texture::SetLevelImage(GLenum target,
-                            GLint level,
-                            gl::GLImage* image,
-                            ImageState state) {
+void Texture::SetLevelImageInternal(
+    GLenum target,
+    GLint level,
+    gl::GLImage* image,
+    gl::GLStreamTextureImage* stream_texture_image,
+    ImageState state) {
   DCHECK_GE(level, 0);
   size_t face_index = GLES2Util::GLTargetToFaceIndex(target);
   DCHECK_LT(static_cast<size_t>(face_index),
             face_infos_.size());
   DCHECK_LT(static_cast<size_t>(level),
             face_infos_[face_index].level_infos.size());
   Texture::LevelInfo& info =
       face_infos_[face_index].level_infos[level];
   DCHECK_EQ(info.target, target);
   DCHECK_EQ(info.level, level);
   info.image = image;
+  info.stream_texture_image = stream_texture_image;
   info.image_state = state;
 
   UpdateCanRenderCondition();
   UpdateHasImages();
 }
 
-gl::GLImage* Texture::GetLevelImage(GLint target,
-                                    GLint level,
-                                    ImageState* state) const {
+void Texture::SetLevelImage(GLenum target,
+                            GLint level,
+                            gl::GLImage* image,
+                            ImageState state) {
+  SetLevelImageInternal(target, level, image, nullptr, state);
+}
+
+void Texture::SetLevelStreamTextureImage(GLenum target,
+                                         GLint level,
+                                         gl::GLStreamTextureImage* image,
+                                         ImageState state) {
+  SetLevelImageInternal(target, level, image, image, state);
+}
+
+const Texture::LevelInfo* Texture::GetLevelInfo(GLint target,
+                                                GLint level) const {
   if (target != GL_TEXTURE_2D && target != GL_TEXTURE_EXTERNAL_OES &&
       target != GL_TEXTURE_RECTANGLE_ARB) {
     return NULL;
   }
 
   size_t face_index = GLES2Util::GLTargetToFaceIndex(target);
   if (level >= 0 && face_index < face_infos_.size() &&
       static_cast<size_t>(level) < face_infos_[face_index].level_infos.size()) {
     const LevelInfo& info = face_infos_[face_index].level_infos[level];
-    if (info.target != 0) {
-      if (state)
-        *state = info.image_state;
-      return info.image.get();
-    }
+    if (info.target != 0)
+      return &info;
   }
   return NULL;
 }
 
+gl::GLImage* Texture::GetLevelImage(GLint target,
+                                    GLint level,
+                                    ImageState* state) const {
+  const LevelInfo* info = GetLevelInfo(target, level);
+  if (!info)
+    return NULL;

[reveman, 2016/02/18 20:20:56]

nit: nullptr

[liberato (no reviews please), 2016/02/19 18:39:56]

Done.

+
+  if (state)
+    *state = info->image_state;
+  return info->image.get();
+}
+
 gl::GLImage* Texture::GetLevelImage(GLint target, GLint level) const {
   return GetLevelImage(target, level, nullptr);
 }
 
+gl::GLStreamTextureImage* Texture::GetLevelStreamTextureImage(
+    GLint target,
+    GLint level) const {
+  const LevelInfo* info = GetLevelInfo(target, level);
+  if (!info)
+    return NULL;

[reveman, 2016/02/18 20:20:57]

nit: nullptr

[liberato (no reviews please), 2016/02/19 18:39:56]

Done.

+
+  return info->stream_texture_image.get();
+}
+
 void Texture::DumpLevelMemory(base::trace_event::ProcessMemoryDump* pmd,
                               uint64_t client_tracing_id,
                               const std::string& dump_name) const {
   for (uint32_t face_index = 0; face_index < face_infos_.size(); ++face_index) {
     const auto& level_infos = face_infos_[face_index].level_infos;
     for (uint32_t level_index = 0; level_index < level_infos.size();
          ++level_index) {
       // Skip levels with no size. Textures will have empty levels for all
       // potential mip levels which are not in use.
       if (!level_infos[level_index].estimated_size)
@@ skipping 475 matching lines @@
 
 void TextureManager::SetLevelImage(TextureRef* ref,
                                    GLenum target,
                                    GLint level,
                                    gl::GLImage* image,
                                    Texture::ImageState state) {
   DCHECK(ref);
   ref->texture()->SetLevelImage(target, level, image, state);
 }
 
+void TextureManager::SetLevelStreamTextureImage(TextureRef* ref,
+                                                GLenum target,
+                                                GLint level,
+                                                gl::GLStreamTextureImage* image,
+                                                Texture::ImageState state) {
+  DCHECK(ref);
+  ref->texture()->SetLevelStreamTextureImage(target, level, image, state);
+}
+
 size_t TextureManager::GetSignatureSize() const {
   return sizeof(TextureTag) + sizeof(TextureSignature);
 }
 
 void TextureManager::AddToSignature(
     TextureRef* ref,
     GLenum target,
     GLint level,
     std::string* signature) const {
   ref->texture()->AddToSignature(feature_info_.get(), target, level, signature);
@@ skipping 867 matching lines @@
 uint32_t TextureManager::GetServiceIdGeneration() const {
   return current_service_id_generation_;
 }
 
 void TextureManager::IncrementServiceIdGeneration() {
   current_service_id_generation_++;
 }
 
 }  // namespace gles2
 }  // namespace gpu