Revert 114059 - Fixed service side implementation of glTexStorage2DEXT to only initialize the num...

gpu/command_buffer/service/texture_manager.cc

Index: gpu/command_buffer/service/texture_manager.cc
===================================================================
--- gpu/command_buffer/service/texture_manager.cc	(revision 114132)
+++ gpu/command_buffer/service/texture_manager.cc	(working copy)
@@ -106,7 +106,8 @@
 }
 
 bool TextureManager::TextureInfo::MarkMipmapsGenerated(
-    const FeatureInfo* feature_info) {
+    const FeatureInfo* feature_info,
+    bool cleared) {
   if (!CanGenerateMipmaps(feature_info)) {
     return false;
   }
@@ -132,7 +133,7 @@
                    info1.border,
                    info1.format,
                    info1.type,
-                   true);
+                   cleared);
     }
   }
 
@@ -523,7 +524,7 @@
   // needed to be able to call GL correctly.
   info.cleared = decoder->ClearLevel(
       service_id_, target_, info.target, info.level, info.format, info.type,
-      info.width, info.height, immutable_);
+      info.width, info.height);
   if (!info.cleared) {
     ++num_uncleared_mips_;
   }
@@ -790,7 +791,8 @@
 
 bool TextureManager::MarkMipmapsGenerated(
     const FeatureInfo* feature_info,
-    TextureManager::TextureInfo* info) {
+    TextureManager::TextureInfo* info,
+    bool cleared) {
   DCHECK(info);
   if (!info->CanRender(feature_info)) {
     DCHECK_NE(0, num_unrenderable_textures_);
@@ -802,7 +804,7 @@
   }
   num_uncleared_mips_ -= info->num_uncleared_mips();
   DCHECK_GE(num_uncleared_mips_, 0);
-  bool result = info->MarkMipmapsGenerated(feature_info);
+  bool result = info->MarkMipmapsGenerated(feature_info, cleared);
   num_uncleared_mips_ += info->num_uncleared_mips();
   if (!info->CanRender(feature_info)) {
     ++num_unrenderable_textures_;
Property changes on: gpu/command_buffer/service/texture_manager.cc
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/o3d/gpu/command_buffer/service/texture_manager.cc:r69-2775
   Reverse-merged /trunk/src/o3d/gpu/command_buffer/service/texture_manager.cc:r32866-32958