gpu: Add async upload functions.

gpu/command_buffer/client/gles2_implementation.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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "../client/gles2_implementation.h"
 
 #include <algorithm>
 #include <map>
@@ skipping 3182 matching lines @@
   }
   if (!buffer->mapped()) {
     SetGLError(GL_INVALID_OPERATION, "glMapBufferCHROMIUM", "not mapped");
     return false;
   }
   buffer->set_mapped(false);
 
   return true;
 }
 
+GLboolean GLES2Implementation::AsyncTexImage2DCHROMIUM(
+    GLenum target, GLint level, GLint internalformat, GLsizei width,
+    GLsizei height, GLint border, GLenum format, GLenum type,
+    const void* pixels) {
+  GPU_CLIENT_SINGLE_THREAD_CHECK();
+  GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glTexImage2D("
+      << GLES2Util::GetStringTextureTarget(target) << ", "
+      << level << ", "
+      << GLES2Util::GetStringTextureInternalFormat(internalformat) << ", "
+      << width << ", " << height << ", " << border << ", "
+      << GLES2Util::GetStringTextureFormat(format) << ", "
+      << GLES2Util::GetStringPixelType(type) << ", "
+      << static_cast<const void*>(pixels) << ")");
+  if (level < 0 || height < 0 || width < 0) {
+    SetGLError(GL_INVALID_VALUE, "glTexImage2D", "dimension < 0");
+    return false;
+  }
+  uint32 size;
+  uint32 unpadded_row_size;
+  uint32 padded_row_size;
+  if (!GLES2Util::ComputeImageDataSizes(
+          width, height, format, type, unpack_alignment_, &size,
+          &unpadded_row_size, &padded_row_size)) {
+    SetGLError(GL_INVALID_VALUE, "glTexImage2D", "image size too large");
+    return false;
+  }
+
+  GLuint offset = ToGLuint(pixels);
+  BufferTracker::Buffer* buffer = GetBoundPixelUnpackTransferBufferIfValid(

[greggman, 2012/11/30 03:01:51]

GetBoundPixelUnpackTransferBufferIfValid generates GL errors so if it returns
NULL you can't continue.

[epennerAtGoogle, 2012/11/30 04:14:22]

Done.

+      "glAsyncTexImage2DCHROMIUM", offset, size);
+  bool buffer_bound = bound_pixel_unpack_transfer_buffer_id_ && buffer;
+
+  // If there's no data/buffer just issue the AsyncTexImage2D
+  if (!pixels && !buffer_bound) {
+    helper_->AsyncTexImage2DCHROMIUM(
+       target, level, internalformat, width, height, border, format, type,
+       0, 0);

[reveman, 2012/11/30 03:10:20]

GetBoundPixelUnpackTransferBufferIfValid above will generate an error if no
valid buffer is bound. You need to avoid that if calling this function without a
buffer bound and pixels=NULL is valid. Looks like you just need to move the
GetBoundPixelUnpa... call below.

[epennerAtGoogle, 2012/11/30 04:14:22]

Done.

+    return true;
+  }
+
+  // Otherwise, async uploads require a transfer buffer to be bound
+  if (!buffer_bound) {
+    SetGLError(

[reveman, 2012/11/30 03:10:20]

GetBoundPixelUnpackTransferBufferIfValid should already have called SetGLError.
No need to call it again here.

[epennerAtGoogle, 2012/11/30 04:14:22]

Done.

+        GL_INVALID_VALUE, "glAsyncTexImage2DCHROMIUM", "invalid buffer");
+    return false;
+  }
+
+  helper_->AsyncTexImage2DCHROMIUM(
+      target, level, internalformat, width, height, border, format, type,
+      buffer->shm_id(), buffer->shm_offset() + offset);
+  return true;
+}
+
+GLboolean GLES2Implementation::AsyncTexSubImage2DCHROMIUM(
+    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+    GLsizei height, GLenum format, GLenum type, const void* pixels) {
+  GPU_CLIENT_SINGLE_THREAD_CHECK();
+  GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glAsyncTexSubImage2DCHROMIUM("
+      << GLES2Util::GetStringTextureTarget(target) << ", "
+      << level << ", "
+      << xoffset << ", " << yoffset << ", "
+      << width << ", " << height << ", "
+      << GLES2Util::GetStringTextureFormat(format) << ", "
+      << GLES2Util::GetStringPixelType(type) << ", "
+      << static_cast<const void*>(pixels) << ")");
+  if (level < 0 || height < 0 || width < 0) {
+    SetGLError(
+        GL_INVALID_VALUE, "glAsyncTexSubImage2DCHROMIUM", "dimension < 0");
+    return false;
+  }
+  if (height == 0 || width == 0) {
+    return false;
+  }
+
+  uint32 size;
+  uint32 unpadded_row_size;
+  uint32 padded_row_size;
+  if (!GLES2Util::ComputeImageDataSizes(
+        width, height, format, type, unpack_alignment_, &size,
+        &unpadded_row_size, &padded_row_size)) {
+    SetGLError(
+        GL_INVALID_VALUE, "glAsyncTexSubImage2DCHROMIUM", "size to large");
+    return false;
+  }
+
+  // Async uploads require a transfer buffer to be bound.
+  GLuint offset = ToGLuint(pixels);
+  BufferTracker::Buffer* buffer = GetBoundPixelUnpackTransferBufferIfValid(
+      "glAsyncTexSubImage2DCHROMIUM", offset, size);
+  if (!bound_pixel_unpack_transfer_buffer_id_ || !buffer) {

[greggman, 2012/11/30 03:01:51]

same as above. If buffer is NULL errors have already been generated.

[epennerAtGoogle, 2012/11/30 04:14:22]

Done.

+    SetGLError(

[reveman, 2012/11/30 03:10:20]

Same here. GetBoundPixelUnpackTransferBufferIfValid should already have called
SetGLError.

[epennerAtGoogle, 2012/11/30 04:14:22]

Done.

+        GL_INVALID_VALUE, "glAsyncTexSubImage2DCHROMIUM", "invalid buffer");
+    return false;
+  }
+
+  helper_->AsyncTexSubImage2DCHROMIUM(
+      target, level, xoffset, yoffset, width, height, format, type,
+      buffer->shm_id(), buffer->shm_offset() + offset);
+  return true;
+}
+
 // 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 "../client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu