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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/command_buffer/service/texture_manager_unittest.cc

Issue 10796096: Add tracing of all memory allocated in all contexts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More trybot constructor fixes Created 8 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
« no previous file with comments | « gpu/command_buffer/service/texture_manager.cc ('k') | gpu/command_buffer/service/vertex_attrib_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/texture_manager_unittest.cc
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc
index 5079e7713d10f6072a71443adbbe051de2253896..5207450e3592bd2688ed55df2f0b02169c015f13 100644
--- a/gpu/command_buffer/service/texture_manager_unittest.cc
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc
@@ -29,7 +29,8 @@ class TextureManagerTest : public testing::Test {
TextureManagerTest()
: feature_info_(new FeatureInfo()),
- manager_(feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize) {
+ manager_(
+ NULL, feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize) {
}
~TextureManagerTest() {
@@ -127,7 +128,7 @@ TEST_F(TextureManagerTest, TextureUsageExt) {
TestHelper::SetupTextureManagerInitExpectations(gl_.get(),
"GL_ANGLE_texture_usage");
TextureManager manager(
- feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.Initialize();
const GLuint kClient1Id = 1;
const GLuint kService1Id = 11;
@@ -148,7 +149,7 @@ TEST_F(TextureManagerTest, Destroy) {
const GLuint kService1Id = 11;
TestHelper::SetupTextureManagerInitExpectations(gl_.get(), "");
TextureManager manager(
- feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.Initialize();
// Check we can create texture.
manager.CreateTextureInfo(kClient1Id, kService1Id);
@@ -170,7 +171,7 @@ TEST_F(TextureManagerTest, DestroyUnowned) {
const GLuint kService1Id = 11;
TestHelper::SetupTextureManagerInitExpectations(gl_.get(), "");
TextureManager manager(
- feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.Initialize();
// Check we can create texture.
TextureManager::TextureInfo* created_info =
@@ -278,7 +279,7 @@ TEST_F(TextureManagerTest, ValidForTargetNPOT) {
FeatureInfo::Ref feature_info(new FeatureInfo());
feature_info->Initialize(NULL);
TextureManager manager(
- feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
// Check NPOT width on level 0
EXPECT_TRUE(manager.ValidForTarget(GL_TEXTURE_2D, 0, 5, 2, 1));
// Check NPOT height on level 0
@@ -301,7 +302,8 @@ class TextureInfoTest : public testing::Test {
TextureInfoTest()
: feature_info_(new FeatureInfo()),
- manager_(feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize) {
+ manager_(
+ NULL, feature_info_.get(), kMaxTextureSize, kMaxCubeMapTextureSize) {
}
~TextureInfoTest() {
info_ = NULL;
@@ -478,7 +480,7 @@ TEST_F(TextureInfoTest, NPOT2DNPOTOK) {
FeatureInfo::Ref feature_info(new FeatureInfo());
feature_info->Initialize(NULL);
TextureManager manager(
- feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.CreateTextureInfo(kClient1Id, kService1Id);
TextureManager::TextureInfo* info = manager.GetTextureInfo(kClient1Id);
ASSERT_TRUE(info_ != NULL);
@@ -673,7 +675,7 @@ TEST_F(TextureInfoTest, FloatNotLinear) {
FeatureInfo::Ref feature_info(new FeatureInfo());
feature_info->Initialize(NULL);
TextureManager manager(
- feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.CreateTextureInfo(kClient1Id, kService1Id);
TextureManager::TextureInfo* info = manager.GetTextureInfo(kClient1Id);
ASSERT_TRUE(info != NULL);
@@ -695,7 +697,7 @@ TEST_F(TextureInfoTest, FloatLinear) {
FeatureInfo::Ref feature_info(new FeatureInfo());
feature_info->Initialize(NULL);
TextureManager manager(
- feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.CreateTextureInfo(kClient1Id, kService1Id);
TextureManager::TextureInfo* info = manager.GetTextureInfo(kClient1Id);
ASSERT_TRUE(info != NULL);
@@ -713,7 +715,7 @@ TEST_F(TextureInfoTest, HalfFloatNotLinear) {
FeatureInfo::Ref feature_info(new FeatureInfo());
feature_info->Initialize(NULL);
TextureManager manager(
- feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.CreateTextureInfo(kClient1Id, kService1Id);
TextureManager::TextureInfo* info = manager.GetTextureInfo(kClient1Id);
ASSERT_TRUE(info != NULL);
@@ -735,7 +737,7 @@ TEST_F(TextureInfoTest, HalfFloatLinear) {
FeatureInfo::Ref feature_info(new FeatureInfo());
feature_info->Initialize(NULL);
TextureManager manager(
- feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.CreateTextureInfo(kClient1Id, kService1Id);
TextureManager::TextureInfo* info = manager.GetTextureInfo(kClient1Id);
ASSERT_TRUE(info != NULL);
@@ -753,7 +755,7 @@ TEST_F(TextureInfoTest, EGLImageExternal) {
FeatureInfo::Ref feature_info(new FeatureInfo());
feature_info->Initialize(NULL);
TextureManager manager(
- feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.CreateTextureInfo(kClient1Id, kService1Id);
TextureManager::TextureInfo* info = manager.GetTextureInfo(kClient1Id);
ASSERT_TRUE(info != NULL);
@@ -769,7 +771,7 @@ TEST_F(TextureInfoTest, DepthTexture) {
FeatureInfo::Ref feature_info(new FeatureInfo());
feature_info->Initialize(NULL);
TextureManager manager(
- feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
+ NULL, feature_info.get(), kMaxTextureSize, kMaxCubeMapTextureSize);
manager.CreateTextureInfo(kClient1Id, kService1Id);
TextureManager::TextureInfo* info = manager.GetTextureInfo(kClient1Id);
ASSERT_TRUE(info != NULL);
« no previous file with comments | « gpu/command_buffer/service/texture_manager.cc ('k') | gpu/command_buffer/service/vertex_attrib_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698