From 24e86f4ff7cdf8019b61862eeee2e9b9f4b9d27c Mon Sep 17 00:00:00 2001 From: "gman@google.com" Date: Tue, 1 Sep 2009 06:18:51 +0000 Subject: Fixes for texture locking. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25018 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/core/cross/texture.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'o3d/core/cross/texture.cc') 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(); 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(); 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(); 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(); if (!mip_data) { return; -- cgit v1.1