diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 06:18:51 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-01 06:18:51 +0000 |
| commit | 24e86f4ff7cdf8019b61862eeee2e9b9f4b9d27c (patch) | |
| tree | e285f2c9872c7ea60fe71fa314cc00bf798bc6b9 /o3d/core/cross/texture.cc | |
| parent | 70c8e97a69ef8806b1812b2cd0ebe831f3792cb6 (diff) | |
| download | chromium_src-24e86f4ff7cdf8019b61862eeee2e9b9f4b9d27c.zip chromium_src-24e86f4ff7cdf8019b61862eeee2e9b9f4b9d27c.tar.gz chromium_src-24e86f4ff7cdf8019b61862eeee2e9b9f4b9d27c.tar.bz2 | |
Fixes for texture locking.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/cross/texture.cc')
| -rw-r--r-- | o3d/core/cross/texture.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/core/cross/texture.cc b/o3d/core/cross/texture.cc index 541864b..c07e99e 100644 --- a/o3d/core/cross/texture.cc +++ b/o3d/core/cross/texture.cc @@ -173,7 +173,7 @@ void Texture2D::DrawImage(const Bitmap& src_img, return; } - LockHelper helper(this, dst_mip, kWriteOnly); + LockHelper helper(this, dst_mip, kReadWrite); uint8* mip_data = helper.GetDataAs<uint8>(); if (!mip_data) { return; @@ -240,7 +240,7 @@ void Texture2D::DrawImage(const Canvas& src_img, return; } - LockHelper helper(this, dst_mip, kWriteOnly); + LockHelper helper(this, dst_mip, kReadWrite); uint8* mip_data = helper.GetDataAs<uint8>(); if (!mip_data) { return; @@ -551,7 +551,7 @@ void TextureCUBE::DrawImage(const Bitmap& src_img, int src_mip, src_pitch); } - LockHelper helper(this, dest_face, dest_mip, kWriteOnly); + LockHelper helper(this, dest_face, dest_mip, kReadWrite); uint8* mip_data = helper.GetDataAs<uint8>(); if (!mip_data) { return; @@ -619,7 +619,7 @@ void TextureCUBE::DrawImage(const Canvas& src_img, return; } - LockHelper helper(this, dest_face, dest_mip, kWriteOnly); + LockHelper helper(this, dest_face, dest_mip, kReadWrite); uint8* mip_data = helper.GetDataAs<uint8>(); if (!mip_data) { return; |