Removing unneeded EffectStream class. Cleaning up data assignment for stream info. Updating the main.scons so that cb can build.

Review URL: http://codereview.chromium.org/155188

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20106 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 12 deletions

diff --git a/o3d/command_buffer/service/cross/resource.h b/o3d/command_buffer/service/cross/resource.h
index 9df3ca4..5c6e6ed 100644
--- a/o3d/command_buffer/service/cross/resource.h
+++ b/o3d/command_buffer/service/cross/resource.h
@@ -153,13 +153,6 @@ class EffectParam: public Resource {
   DISALLOW_COPY_AND_ASSIGN(EffectParam);
 };
 
-class EffectStream: public Resource {
- public:
-  explicit EffectStream() {}
- private:
-  DISALLOW_COPY_AND_ASSIGN(EffectStream);
-};
-
 // Texture class, representing a texture resource.
 class Texture: public Resource {
  public:
diff --git a/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc b/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc
index c55c345..622f363 100644
--- a/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc
+++ b/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc
@@ -351,11 +351,8 @@ bool EffectD3D9::GetStreamDesc(unsigned int index,
   if (size < sizeof(Desc))  // NOLINT
     return false;
 
-  Desc stream = streams_[index];
   Desc *desc = static_cast<Desc *>(data);
-  memset(desc, 0, sizeof(*desc));
-  desc->semantic = stream.semantic;
-  desc->semantic_index = stream.semantic_index;
+  *desc = streams_[index];
   return true;
 }
 
diff --git a/o3d/command_buffer/service/win/d3d9/effect_d3d9.h b/o3d/command_buffer/service/win/d3d9/effect_d3d9.h
index 1180fb8..d860449 100644
--- a/o3d/command_buffer/service/win/d3d9/effect_d3d9.h
+++ b/o3d/command_buffer/service/win/d3d9/effect_d3d9.h
@@ -128,7 +128,6 @@ class EffectD3D9 : public Effect {
   ResourceID samplers_[kMaxSamplerUnits];
 
   friend class EffectParamD3D9;
-  friend class EffectStreamD3D9;
   DISALLOW_COPY_AND_ASSIGN(EffectD3D9);
 };