summaryrefslogtreecommitdiffstats
path: root/o3d/core/win
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 02:59:19 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 02:59:19 +0000
commit0c48c17f7ebcc0c8f79eba1aeae56d32b3c2f03f (patch)
tree4aecf9a612aff48274a8df392ff037015c0ff3e9 /o3d/core/win
parent581bdf049f42f9fd75937841a40eb3c07e7282f2 (diff)
downloadchromium_src-0c48c17f7ebcc0c8f79eba1aeae56d32b3c2f03f.zip
chromium_src-0c48c17f7ebcc0c8f79eba1aeae56d32b3c2f03f.tar.gz
chromium_src-0c48c17f7ebcc0c8f79eba1aeae56d32b3c2f03f.tar.bz2
Fixes for bitmap and GL/CB
Review URL: http://codereview.chromium.org/155556 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/win')
-rw-r--r--o3d/core/win/d3d9/texture_d3d9.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/core/win/d3d9/texture_d3d9.cc b/o3d/core/win/d3d9/texture_d3d9.cc
index 7477848..e35b1af 100644
--- a/o3d/core/win/d3d9/texture_d3d9.cc
+++ b/o3d/core/win/d3d9/texture_d3d9.cc
@@ -229,9 +229,9 @@ Texture2DD3D9::Texture2DD3D9(ServiceLocator* service_locator,
bitmap.CheckAlphaIsOne(),
resize_to_pot,
enable_render_surfaces),
- d3d_texture_(tex) {
+ d3d_texture_(tex),
+ backing_bitmap_(Bitmap::Ref(new Bitmap(service_locator))) {
DCHECK(tex);
- backing_bitmap_ = Bitmap::Ref(new Bitmap(service_locator));
}
// Attempts to create a IDirect3DTexture9 with the given specs. If the creation
@@ -487,8 +487,8 @@ TextureCUBED3D9::TextureCUBED3D9(ServiceLocator* service_locator,
bitmap.CheckAlphaIsOne(),
resize_to_pot,
enable_render_surfaces),
- d3d_cube_texture_(tex) {
- backing_bitmap_ = Bitmap::Ref(new Bitmap(service_locator));
+ d3d_cube_texture_(tex),
+ backing_bitmap_(Bitmap::Ref(new Bitmap(service_locator))) {
}
// Attempts to create a D3D9 CubeTexture with the given specs. If creation