summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2015-10-26 19:39:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-27 02:40:00 +0000
commit9291c758490f36fb7139e2a6a8c341e118037d3a (patch)
tree879f510cbd250815a8a138b401b431dae68fdd85 /cc
parent1637db318e525b5c1e3a960eeb59dee151f049ca (diff)
downloadchromium_src-9291c758490f36fb7139e2a6a8c341e118037d3a.zip
chromium_src-9291c758490f36fb7139e2a6a8c341e118037d3a.tar.gz
chromium_src-9291c758490f36fb7139e2a6a8c341e118037d3a.tar.bz2
ui: Add support for creating GLImage instances from shared memory pools.
This adds an offset field to the GpuMemoryBufferHandle struct that allows shared memory backed GLImages to be created from a pool of shared memory. This is useful when importing buffers as it allows the clients to manage the memory used for buffers. BUG=538325 TEST=gl_unittests --gtest_filter=GLImageSharedMemoryPool/GLImageCopyTest/0.CopyTexImage CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1417363006 Cr-Commit-Position: refs/heads/master@{#356212}
Diffstat (limited to 'cc')
-rw-r--r--cc/test/test_gpu_memory_buffer_manager.cc1
-rw-r--r--cc/test/test_image_factory.cc2
2 files changed, 2 insertions, 1 deletions
diff --git a/cc/test/test_gpu_memory_buffer_manager.cc b/cc/test/test_gpu_memory_buffer_manager.cc
index 78fa6ad..a37ff93 100644
--- a/cc/test/test_gpu_memory_buffer_manager.cc
+++ b/cc/test/test_gpu_memory_buffer_manager.cc
@@ -56,6 +56,7 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
gfx::GpuMemoryBufferHandle handle;
handle.type = gfx::SHARED_MEMORY_BUFFER;
handle.handle = shared_memory_->handle();
+ handle.offset = 0;
return handle;
}
ClientBuffer AsClientBuffer() override {
diff --git a/cc/test/test_image_factory.cc b/cc/test/test_image_factory.cc
index aaf61ac..796b6d8 100644
--- a/cc/test/test_image_factory.cc
+++ b/cc/test/test_image_factory.cc
@@ -24,7 +24,7 @@ scoped_refptr<gfx::GLImage> TestImageFactory::CreateImageForGpuMemoryBuffer(
scoped_refptr<gfx::GLImageSharedMemory> image(
new gfx::GLImageSharedMemory(size, internalformat));
- if (!image->Initialize(handle.handle, handle.id, format))
+ if (!image->Initialize(handle.handle, handle.id, format, handle.offset))
return nullptr;
return image;