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

4 files changed, 6 insertions, 19 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);
 };
 
diff --git a/o3d/main.scons b/o3d/main.scons
index ac4746e..9d357ae 100644
--- a/o3d/main.scons
+++ b/o3d/main.scons
@@ -165,9 +165,10 @@ nacl_imc_all_libs = [
 # All the libs required for HTP layer on the host.
 nacl_htp_all_libs = [
   nacl_imc_lib,
-  'google_nacl_npruntime', # The lib reguired for the NPAPI bridge.
+  'google_nacl_imc_c',
   'nrd_xfer',
   'gio',
+  'naclthread',
   ]
 
 binaries_env = base_env.Clone()
@@ -192,7 +193,7 @@ binaries_env.Append(
     # TODO: this is ugly, should all be rolling into builder.
     NACL_OBJ_ROOT = '$NACL_DIR/scons-out/$NACL_VARIANT/obj',
     NACL_LIB_DIR = '$NACL_DIR/scons-out/$NACL_VARIANT/lib',
-    NACL_HTP_LIBS = nacl_imc_all_libs,
+    NACL_HTP_LIBS = nacl_htp_all_libs,
 )
 
 # This function adds a path to a windows environment variable like PATH,
@@ -225,10 +226,7 @@ def AddNaclBuildCommand(env, variant, platforms):
   else:
     script_suffix = '.sh'
 
-  if variant == 'nacl':
-    build_libs = nacl_htp_all_libs
-  else :
-    build_libs = nacl_imc_all_libs
+  build_libs = nacl_htp_all_libs
 
   targets = ['$NACL_LIB_DIR/${LIBPREFIX}' + f + '${LIBSUFFIX}'
              for f in build_libs]
@@ -505,7 +503,7 @@ windows_cb_env.Append(
       'o3dCmdBuf_client',
       'o3dCmdBuf_common',
       'd3d9', 'dxerr', 'd3dx9'
-    ] + nacl_imc_all_libs
+    ] + nacl_htp_all_libs
 )
 
 windows_cb_debug_env = windows_cb_env.Clone(