cc/resources/resource_provider_unittest.cc - Issue 1251693003: cc: Fix the format of GpuMemoryBuffer for SurfaceTexture

Unified Diff: cc/resources/resource_provider_unittest.cc

Issue 1251693003: cc: Fix the format of GpuMemoryBuffer for SurfaceTexture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix kVideoImageTextureTarget Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/resources/resource_provider_unittest.cc

diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc

index 136855847db72d82a8ea2ccd33be7fb3b16a3daa..d76b96199591b610a86acf5cd05143e846671908 100644

--- a/cc/resources/resource_provider_unittest.cc

+++ b/cc/resources/resource_provider_unittest.cc

@@ -7,6 +7,7 @@

#include <algorithm>

#include <map>

#include <set>

+#include <vector>

#include "base/bind.h"

#include "base/containers/hash_tables.h"

@@ -42,6 +43,10 @@ using testing::_;

namespace cc {

namespace {

+const std::vector<unsigned> g_imaget_targets(gfx::GpuMemoryBuffer::FORMAT_LAST +

reveman 2015/07/31 16:05:43 nit: s/g_imaget_targets/g_image_texture_targets/

+ 1,

+ GL_TEXTURE_2D);

static void EmptyReleaseCallback(uint32 sync_point,

bool lost_resource,

BlockingTaskRunner* main_thread_task_runner) {

@@ -421,11 +426,11 @@ class ResourceProviderTest

resource_provider_ = ResourceProvider::Create(

output_surface_.get(), shared_bitmap_manager_.get(),

gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0,

- false, 1, false);

+ false, 1, false, g_imaget_targets);

child_resource_provider_ = ResourceProvider::Create(

child_output_surface_.get(), shared_bitmap_manager_.get(),

gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0,

- false, 1, false);

+ false, 1, false, g_imaget_targets);

}

ResourceProviderTest() : ResourceProviderTest(true) {}

@@ -1367,7 +1372,8 @@ TEST_P(ResourceProviderTest, TransferGLToSoftware) {

scoped_ptr<ResourceProvider> child_resource_provider(ResourceProvider::Create(

child_output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -1851,7 +1857,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {

scoped_ptr<ResourceProvider> child_resource_provider(

ResourceProvider::Create(child_output_surface.get(),

shared_bitmap_manager.get(), NULL, NULL, 0,

- false, 1, false));

+ false, 1, false, g_imaget_targets));

scoped_ptr<TextureStateTrackingContext> parent_context_owned(

new TextureStateTrackingContext);

@@ -1865,7 +1871,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {

scoped_ptr<ResourceProvider> parent_resource_provider(

ResourceProvider::Create(parent_output_surface.get(),

shared_bitmap_manager.get(), NULL, NULL, 0,

- false, 1, false));

+ false, 1, false, g_imaget_targets));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2497,7 +2503,8 @@ TEST_P(ResourceProviderTest, ScopedSampler) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2579,7 +2586,8 @@ TEST_P(ResourceProviderTest, ManagedResource) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2626,7 +2634,8 @@ TEST_P(ResourceProviderTest, TextureWrapMode) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2676,7 +2685,8 @@ TEST_P(ResourceProviderTest, TextureHint) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2741,7 +2751,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_SharedMemory) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 0,

- false, 1, false));

+ false, 1, false, g_imaget_targets));

uint32 release_sync_point = 0;

bool lost_resource = false;

@@ -2790,7 +2800,7 @@ class ResourceProviderTestTextureMailboxGLFilters

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager, gpu_memory_buffer_manager,

- main_thread_task_runner, 0, false, 1, false));

+ main_thread_task_runner, 0, false, 1, false, g_imaget_targets));

unsigned texture_id = 1;

uint32 sync_point = 30;

@@ -2933,7 +2943,8 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

uint32 sync_point = 30;

unsigned target = GL_TEXTURE_EXTERNAL_OES;

@@ -3002,7 +3013,8 @@ TEST_P(ResourceProviderTest,

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

uint32 sync_point = 30;

unsigned target = GL_TEXTURE_2D;

@@ -3055,7 +3067,8 @@ TEST_P(ResourceProviderTest, TextureMailbox_WaitSyncPointIfNeeded_NoSyncPoint) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

uint32 sync_point = 0;

unsigned target = GL_TEXTURE_2D;

@@ -3175,7 +3188,8 @@ TEST_P(ResourceProviderTest, TextureAllocation) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

gfx::Size size(2, 2);

gfx::Vector2d offset(0, 0);

@@ -3249,7 +3263,8 @@ TEST_P(ResourceProviderTest, TextureAllocationHint) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

gfx::Size size(2, 2);

@@ -3304,7 +3319,8 @@ TEST_P(ResourceProviderTest, TextureAllocationHint_BGRA) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

gfx::Size size(2, 2);

const ResourceFormat formats[2] = {RGBA_8888, BGRA_8888};

@@ -3358,7 +3374,8 @@ TEST_P(ResourceProviderTest, PixelBuffer_GLTexture) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);

@@ -3400,7 +3417,8 @@ TEST_P(ResourceProviderTest, ForcingAsyncUploadToComplete) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);

@@ -3442,7 +3460,8 @@ TEST_P(ResourceProviderTest, PixelBufferLostContext) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

EXPECT_CALL(*context, NextTextureId()).WillRepeatedly(Return(texture_id));

@@ -3482,7 +3501,8 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);

@@ -3567,7 +3587,8 @@ TEST_P(ResourceProviderTest, CopyResource_GLTexture) {

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

source_id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);

@@ -3640,7 +3661,8 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) {

gfx::Size size(4, 4);

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

int texture_id = 123;

ResourceId id = resource_provider->CreateResource(

@@ -3671,7 +3693,8 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Upload) {

gfx::Size size(4, 4);

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager_.get(),

- gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false));

+ gpu_memory_buffer_manager_.get(), NULL, 0, false, 1, false,

+ g_imaget_targets));

int texture_id = 123;

uint8_t pixels[8];

@@ -3727,7 +3750,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {

size_t kTextureAllocationChunkSize = 1;

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,

- kTextureAllocationChunkSize, false));

+ kTextureAllocationChunkSize, false, g_imaget_targets));

ResourceId id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,

@@ -3743,7 +3766,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {

size_t kTextureAllocationChunkSize = 8;

scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0, false,

- kTextureAllocationChunkSize, false));

+ kTextureAllocationChunkSize, false, g_imaget_targets));

ResourceId id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TEXTURE_HINT_IMMUTABLE,

« no previous file with comments | « cc/resources/resource_provider.cc ('k') | cc/surfaces/display.cc » ('j') | cc/test/pixel_test.cc » ('J')