* Raising the pdiff threshold for the beachdemo test to correct pulse failure (fails with the same diff on my PC)

* Added comment about the valid values for the min, mag and mip filters in sampler.idl
* Cleaned up some typos in texture.idl
* Changed the texture-set-test to use POINT filter for min and mag to avoid issues with h/w that doesn't support linear filtering of floating point textures
* Bumped up rev for o3d_assets to include new reference image for texture-set-test

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

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

2 files changed, 11 insertions, 8 deletions

diff --git a/o3d/plugin/idl/sampler.idl b/o3d/plugin/idl/sampler.idl
index b8d9c5e..2f75ccc 100644
--- a/o3d/plugin/idl/sampler.idl
+++ b/o3d/plugin/idl/sampler.idl
@@ -96,17 +96,20 @@ class Sampler : ParamObject {
   [getter, setter] AddressMode address_mode_w_;
 
   %[
-    The magnification filter.
+    The magnification filter.  Valid values for the mag filter are: POINT and
+    LINEAR.
   %]
   [getter, setter] FilterType mag_filter_;
 
   %[
-    The minification filter.
+    The minification filter. Valid values for the min filter are: POINT, LINEAR
+    and ANISOTROPIC.
   %]
   [getter, setter] FilterType min_filter_;
 
   %[
-    The mipmap filter used during minification.
+    The mipmap filter used during minification.  Valid values for the mip filter
+    are: NONE, POINT and LINEAR.
   %]
   [getter, setter] FilterType mip_filter_;
 
diff --git a/o3d/plugin/idl/texture.idl b/o3d/plugin/idl/texture.idl
index 0f4614b..cc470c0 100644
--- a/o3d/plugin/idl/texture.idl
+++ b/o3d/plugin/idl/texture.idl
@@ -130,7 +130,7 @@ namespace o3d {
   %]
   RenderSurface? GetRenderSurface(int mip_level, Pack pack);
 
-  // TODO: Add Get, GetRect, SetRect and/or expose Bitmap.
+  // TODO: Add Get, GetRect and/or expose Bitmap.
   %[
     Sets the values of the data stored in the texture.
 
@@ -166,16 +166,16 @@ namespace o3d {
 
     Does clipping. In other words if you pass in a 10x10 pixel array
     and give it destination of (-5, -5) it will only use the bottom 5x5
-    pixels of the array you passed in to set to set the top 5x5 pixels of the
+    pixels of the array you passed in to set the top 5x5 pixels of the
     texture.
 
     See o3d.Texture2D.set for details on formats.
 
     \param level the mip level to update.
-    \param destination_x The x coordinate of the area in the texture to effect.
-    \param destination_y The y coordinate of the area in the texture to effect.
+    \param destination_x The x coordinate of the area in the texture to affect.
+    \param destination_y The y coordinate of the area in the texture to affect.
     \param source_width The width of the area to effect. The height is
-        determined bythe size of the array passed in.
+        determined by the size of the array passed in.
     \param values Values to be stored in the buffer.
     \see o3d.Texture2D.set
   %]