Adding GetStreamInfo functionality (and passing corresponding unit test).

command_buffer/service/win/d3d9/effect_d3d9.h

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 62 matching lines @@
   EffectD3D9 *effect_;
   D3DXHANDLE handle_;
   unsigned int sampler_unit_count_;
   scoped_array<unsigned int> sampler_units_;
 };
 
 // D3D9 version of Effect.
 class EffectD3D9 : public Effect {
  public:
   EffectD3D9(ID3DXEffect *d3d_effect,
-             ID3DXConstantTable *fs_constant_table);
+             ID3DXConstantTable *fs_constant_table,
+             IDirect3DVertexShader9 *d3d_vertex_shader);
   virtual ~EffectD3D9();
   // Compiles and creates an effect from source code.
   static EffectD3D9 *Create(GAPID3D9 *gapi,
                             const String &effect_code,
                             const String &vertex_program_entry,
                             const String &fragment_program_entry);
   // Applies the effect states (vertex shader, pixel shader) to D3D.
   bool Begin(GAPID3D9 *gapi);
   // Resets the effect states (vertex shader, pixel shader) to D3D.
   void End(GAPID3D9 *gapi);
   // Commits parameters to D3D, if they were modified while the effect is
   // active.
   bool CommitParameters(GAPID3D9 *gapi);
 
   // Gets the number of parameters in the effect.
   unsigned int GetParamCount();
   // Creates an effect parameter with the specified index.
   EffectParamD3D9 *CreateParam(unsigned int index);
   // Creates an effect parameter of the specified name.
   EffectParamD3D9 *CreateParamByName(const char *name);
+  // Gets the number of stream inputs for the effect.
+  unsigned int GetStreamCount();
+  // Gets the stream data with the specified index.
+  bool GetStreamDesc(unsigned int index, unsigned int size, void *data);
  private:
   typedef std::vector<EffectParamD3D9 *> ParamList;
+  typedef std::vector<effect_stream::Desc> StreamList;
 
   // Links a param into this effect.
   void LinkParam(EffectParamD3D9 *param);
   // Unlinks a param into this effect.
   void UnlinkParam(EffectParamD3D9 *param);
   // Sets sampler states.
   bool SetSamplers(GAPID3D9 *gapi);
+  // Sets streams vector.
+  bool SetStreams();
 
   ID3DXEffect *d3d_effect_;
+  IDirect3DVertexShader9 *d3d_vertex_shader_;
   ID3DXConstantTable *fs_constant_table_;
   ParamList params_;
+  StreamList streams_;
   bool sync_parameters_;
   ResourceID samplers_[kMaxSamplerUnits];
 
   friend class EffectParamD3D9;
+  friend class EffectStreamD3D9;

[Antoine Labour, 2009/07/06 23:48:12]

Not needed any more.

   DISALLOW_COPY_AND_ASSIGN(EffectD3D9);
 };
 
 }  // namespace command_buffer
 }  // namespace o3d
 
 #endif  // O3D_COMMAND_BUFFER_SERVICE_WIN_D3D9_EFFECT_D3D9_H__