Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(558)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/resource_provider_unittest.cc

Issue 1425533006: cc: Add flag to specify to ResourceProvider to always use GMBs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test and build Created 5 years, 1 month 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
« no previous file with comments | « cc/resources/resource_provider.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider_unittest.cc
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 874fd54f35c162f6311136001baf4247cb01cda6..bcdb6adfa4d5d4a3948589cc17ac8e139d05e26d 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc
@@ -422,11 +422,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, 1,
- use_image_texture_targets_);
+ use_gpu_memory_buffer_resources_, use_image_texture_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, 1,
- use_image_texture_targets_);
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_);
}
ResourceProviderTest() : ResourceProviderTest(true) {}
@@ -487,11 +487,15 @@ class ResourceProviderTest
}
public:
+ static bool use_gpu_memory_buffer_resources() {
+ return use_gpu_memory_buffer_resources_;
+ }
static std::vector<unsigned> use_image_texture_targets() {
return use_image_texture_targets_;
}
protected:
+ static bool use_gpu_memory_buffer_resources_;
static std::vector<unsigned> use_image_texture_targets_;
scoped_ptr<ContextSharedData> shared_data_;
ResourceProviderContext* context3d_;
@@ -507,6 +511,8 @@ class ResourceProviderTest
scoped_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_;
};
+bool ResourceProviderTest::use_gpu_memory_buffer_resources_ = false;
+
std::vector<unsigned> ResourceProviderTest::use_image_texture_targets_ =
std::vector<unsigned>(static_cast<size_t>(gfx::BufferFormat::LAST) + 1,
GL_TEXTURE_2D);
@@ -1379,7 +1385,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -1863,6 +1869,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
scoped_ptr<ResourceProvider> child_resource_provider(
ResourceProvider::Create(child_output_surface.get(),
shared_bitmap_manager.get(), NULL, NULL, 0, 1,
+ use_gpu_memory_buffer_resources_,
use_image_texture_targets_));
scoped_ptr<TextureStateTrackingContext> parent_context_owned(
@@ -1877,6 +1884,7 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {
scoped_ptr<ResourceProvider> parent_resource_provider(
ResourceProvider::Create(parent_output_surface.get(),
shared_bitmap_manager.get(), NULL, NULL, 0, 1,
+ use_gpu_memory_buffer_resources_,
use_image_texture_targets_));
gfx::Size size(1, 1);
@@ -2505,7 +2513,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2584,7 +2592,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2627,7 +2635,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2671,7 +2679,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
gfx::Size size(1, 1);
ResourceFormat format = RGBA_8888;
@@ -2730,7 +2738,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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
uint32 release_sync_point = 0;
bool lost_resource = false;
@@ -2779,7 +2787,8 @@ class ResourceProviderTestTextureMailboxGLFilters
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
output_surface.get(), shared_bitmap_manager, gpu_memory_buffer_manager,
- main_thread_task_runner, 0, 1, use_image_texture_targets_));
+ main_thread_task_runner, 0, 1, use_gpu_memory_buffer_resources_,
+ use_image_texture_targets_));
unsigned texture_id = 1;
uint32 sync_point = 30;
@@ -2923,7 +2932,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
uint32 sync_point = 30;
unsigned target = GL_TEXTURE_EXTERNAL_OES;
@@ -2993,7 +3002,7 @@ TEST_P(ResourceProviderTest,
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
output_surface.get(), shared_bitmap_manager_.get(),
gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
uint32 sync_point = 30;
unsigned target = GL_TEXTURE_2D;
@@ -3047,7 +3056,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
uint32 sync_point = 0;
unsigned target = GL_TEXTURE_2D;
@@ -3168,7 +3177,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
gfx::Size size(2, 2);
gfx::Vector2d offset(0, 0);
@@ -3224,7 +3233,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
gfx::Size size(2, 2);
@@ -3280,7 +3289,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
gfx::Size size(2, 2);
const ResourceFormat formats[2] = {RGBA_8888, BGRA_8888};
@@ -3339,7 +3348,7 @@ 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, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
id = resource_provider->CreateResource(
size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
@@ -3348,7 +3357,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {
.WillOnce(Return(kTextureId))
.RetiresOnSaturation();
EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, kTextureId))
- .Times(1)
+ .Times(3)
.RetiresOnSaturation();
EXPECT_CALL(*context, createImageCHROMIUM(_, kWidth, kHeight, GL_RGBA))
.WillOnce(Return(kImageId))
@@ -3417,7 +3426,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) {
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
output_surface.get(), shared_bitmap_manager_.get(),
gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
int texture_id = 123;
ResourceId id = resource_provider->CreateResource(
@@ -3449,7 +3458,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Upload) {
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
output_surface.get(), shared_bitmap_manager_.get(),
gpu_memory_buffer_manager_.get(), NULL, 0, 1,
- use_image_texture_targets_));
+ use_gpu_memory_buffer_resources_, use_image_texture_targets_));
int texture_id = 123;
uint8_t pixels[8];
@@ -3506,6 +3515,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0,
kTextureAllocationChunkSize,
+ ResourceProviderTest::use_gpu_memory_buffer_resources(),
ResourceProviderTest::use_image_texture_targets()));
ResourceId id = resource_provider->CreateResource(
@@ -3522,6 +3532,7 @@ TEST(ResourceProviderTest, TextureAllocationChunkSize) {
scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(
output_surface.get(), shared_bitmap_manager.get(), NULL, NULL, 0,
kTextureAllocationChunkSize,
+ ResourceProviderTest::use_gpu_memory_buffer_resources(),
ResourceProviderTest::use_image_texture_targets()));
ResourceId id = resource_provider->CreateResource(
« no previous file with comments | « cc/resources/resource_provider.cc ('k') | cc/surfaces/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698