gpu: Add async pixel transfer interface, stub and tests.

gpu/command_buffer/service/gles2_cmd_decoder.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/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 37 matching lines @@
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/stream_texture.h"
 #include "gpu/command_buffer/service/stream_texture_manager.h"
 #include "gpu/command_buffer/service/texture_definition.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 #include "gpu/command_buffer/service/vertex_array_manager.h"
+#include "ui/gl/async_pixel_transfer_delegate.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #if defined(OS_MACOSX)
 #include "ui/surface/io_surface_support_mac.h"
 #endif
 
 #if !defined(GL_DEPTH24_STENCIL8)
 #define GL_DEPTH24_STENCIL8 0x88F0
 #endif
@@ skipping 9324 matching lines @@
     return error::kNoError;
   }
   if (!validators_->pixel_type.IsValid(type)) {
     SetGLErrorInvalidEnum("glTexSubImage2D", type, "type");
     return error::kNoError;
   }
   if (pixels == NULL) {
     return error::kOutOfBounds;
   }
 
-  // TODO(epenner): Do this via an async task.
-  DoTexSubImage2D(
-      target, level, xoffset, yoffset, width, height, format, type, pixels);
+  // We only support async uploads to 2D textures for now.
+  if (target != GL_TEXTURE_2D) {
+    SetGLErrorInvalidEnum("glTexSubImage2D", type, "type");

[greggman, 2012/12/05 02:23:42]

s/glTexSubImage2D/glAsyncTexSubImage2DCHROMIUM/

here and a bunch of other places

[epenner, 2012/12/08 03:15:03]

Done.

+    return error::kNoError;
+  }
+
+  // We only support uploads to level zero for now.
+  if (level != 0) {
+    SetGLError(GL_INVALID_VALUE, "glTexSubImage2D", "level != 0");
+    return error::kNoError;
+  }
+
+  const TextureUnit& unit = state_.texture_units[state_.active_texture_unit];
+  TextureManager::TextureInfo* info = unit.bound_texture_2d;
+
+  // TODO(epenner): We should really do this level clear as part of the

[apatrick, 2012/12/03 21:23:59]

It might be a bit tricky to synchronize that. Maybe it's okay to do it here if
it is known to be rare. Let's see what gman thinks.

[epennerAtGoogle, 2012/12/03 22:48:45]

Hmm.. You are right. If we keep the clear here, then everything is safe.  Since
the cost can easily be avoided, best to just keep it here.

[epennerAtGoogle, 2012/12/04 19:56:48]

Done.

+  // async upload. However this clear is rarely needed anyway.
+  GLsizei tex_width = 0;
+  GLsizei tex_height = 0;
+  bool ok = info->GetLevelSize(target, level, &tex_width, &tex_height);
+  DCHECK(ok);
+  if (xoffset != 0 || yoffset != 0 ||
+      width != tex_width || height != tex_height) {
+    if (!texture_manager()->ClearTextureLevel(this, info, target, level)) {
+      SetGLError(GL_OUT_OF_MEMORY, "glTexSubImage2D", "dimensions too big");
+      return error::kNoError;
+    }
+  }
+
+  // TODO(epenner): The level is technically not cleared yet!
+  // However we need to mark it as cleared to use the texture.
+  // It looks like we need to mark as cleared in an async reply.
+  texture_manager()->SetLevelCleared(info, target, level);
+  gfx::AsyncPixelTransferDelegate::Get()->AsyncTexSubImage2D(

[greggman, 2012/12/05 02:23:42]

I thought singletons are discouraged in Chromium? Other than the driver setup
I'm not aware of any other singleton's in the gpu code. Is there a reason for
this exception? It's certainly easier then passing in or setting some
AsyncPixelTransferManager but it also makes it harder to mock for testing.

[epenner, 2012/12/05 04:01:54]

It's one of my TODOs. Yeah I wasn't sure initially where to put it and I still
haven't investigated it. If you have a good home in mind I'm all ears. It needs
to exist at a pretty high level in the GPU process so multiple don't get
created.

+      info->AsyncTransferState(), target, level, xoffset, yoffset,
+      width, height, format, type, pixels);
+
   return error::kNoError;
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu