summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authormaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 02:44:41 +0000
committermaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 02:44:41 +0000
commit1988cb16ee6798bbdafaf62bbbd017eb1f49ed65 (patch)
treee0a151d54cf4c29cdb87f1009e0dbdff0e39dd8a /o3d
parentd5e7e7827677ffb78b0b9142e2ab5e289cc9de49 (diff)
downloadchromium_src-1988cb16ee6798bbdafaf62bbbd017eb1f49ed65.zip
chromium_src-1988cb16ee6798bbdafaf62bbbd017eb1f49ed65.tar.gz
chromium_src-1988cb16ee6798bbdafaf62bbbd017eb1f49ed65.tar.bz2
Don't zero newly allocated bitmap data - it's already been zeroed.
Review URL: http://codereview.chromium.org/159622 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/core/cross/gl/texture_gl.cc4
-rw-r--r--o3d/core/win/d3d9/texture_d3d9.cc4
2 files changed, 0 insertions, 8 deletions
diff --git a/o3d/core/cross/gl/texture_gl.cc b/o3d/core/cross/gl/texture_gl.cc
index 3238208..f904d3d 100644
--- a/o3d/core/cross/gl/texture_gl.cc
+++ b/o3d/core/cross/gl/texture_gl.cc
@@ -347,8 +347,6 @@ Texture2DGL* Texture2DGL::Create(ServiceLocator* service_locator,
// for use during Texture2DGL::Lock.
if (resize_to_pot) {
texture->backing_bitmap_->AllocateData();
- memset(texture->backing_bitmap_->image_data(), 0,
- texture->backing_bitmap_->GetTotalSize());
texture->has_levels_ = (1 << bitmap->num_mipmaps()) - 1;
}
}
@@ -593,8 +591,6 @@ TextureCUBEGL* TextureCUBEGL::Create(ServiceLocator* service_locator,
// for use during TextureCUBEGL::Lock.
if (resize_to_pot) {
texture->backing_bitmap_->AllocateData();
- memset(texture->backing_bitmap_->image_data(), 0,
- texture->backing_bitmap_->GetTotalSize());
for (unsigned int face = 0; face < 6; ++face) {
texture->has_levels_[face] = (1 << bitmap->num_mipmaps()) - 1;
}
diff --git a/o3d/core/win/d3d9/texture_d3d9.cc b/o3d/core/win/d3d9/texture_d3d9.cc
index e35b1af..54ed901 100644
--- a/o3d/core/win/d3d9/texture_d3d9.cc
+++ b/o3d/core/win/d3d9/texture_d3d9.cc
@@ -280,8 +280,6 @@ Texture2DD3D9* Texture2DD3D9::Create(ServiceLocator* service_locator,
} else {
if (resize_to_pot) {
texture->backing_bitmap_->AllocateData();
- memset(texture->backing_bitmap_->image_data(), 0,
- texture->backing_bitmap_->GetTotalSize());
}
}
@@ -539,8 +537,6 @@ TextureCUBED3D9* TextureCUBED3D9::Create(ServiceLocator* service_locator,
} else {
if (resize_to_pot) {
texture->backing_bitmap_->AllocateData();
- memset(texture->backing_bitmap_->image_data(), 0,
- texture->backing_bitmap_->GetTotalSize());
}
}