Fixing unit_test bugs. One of hte fixes is for the texture param. This quiets the unit test, but has a todo under the actual code. To make all examples run, this should be completed, but if we're going ot eliminate the texture path in favor of the sampler path, then it doesn't make sense to fill this in if we'll delete it shortly.

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

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

1 files changed, 14 insertions, 0 deletions

diff --git a/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc b/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc
index a472e79..7cfee14 100644
--- a/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc
+++ b/o3d/command_buffer/service/win/d3d9/effect_d3d9.cc
@@ -227,6 +227,16 @@ static effect_param::DataType GetDataTypeFromD3D(
       } else {
         return effect_param::UNKNOWN;
       }
+    case D3DXPT_TEXTURE:
+    case D3DXPT_TEXTURE1D:
+    case D3DXPT_TEXTURE2D:
+    case D3DXPT_TEXTURE3D:
+    case D3DXPT_TEXTURECUBE:
+      if (desc.Class == D3DXPC_OBJECT) {
+        return effect_param::TEXTURE;
+      } else {
+        return effect_param::UNKNOWN;
+      }
     default:
       return effect_param::UNKNOWN;
   }
@@ -425,6 +435,10 @@ bool EffectParamD3D9::SetData(GAPID3D9 *gapi,
       }
       break;
     }
+    case effect_param::TEXTURE: {
+      // TODO(rlp): finish
+      break;
+    }
     default:
       DLOG(ERROR) << "Invalid parameter type.";
       return false;