Matteo Bruni : d3dx9/tests: Take MaxVolumeExtent into account in some tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c1bf61e56c9cd32615bbc308fa9c5207db2b0fc5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c1bf61e56c9cd32615bbc308fa...

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Thu May  1 18:37:41 2014 +0200

d3dx9/tests: Take MaxVolumeExtent into account in some tests.

---

 dlls/d3dx9_36/tests/texture.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
index fb73bfb..6322c70 100644
--- a/dlls/d3dx9_36/tests/texture.c
+++ b/dlls/d3dx9_36/tests/texture.c
@@ -471,9 +471,9 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device)
 
     IDirect3DDevice9_GetDeviceCaps(device, &caps);
 
-    if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP))
+    if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) || (caps.MaxVolumeExtent < 256))
     {
-        skip("No volume textures support\n");
+        skip("Limited or no volume textures support.\n");
         return;
     }
 
@@ -560,7 +560,7 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device)
     height = 143;
     depth = 55;
     mipmaps = 20;
-    expected = caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2 ? 10 : 9;
+    expected = (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2 && caps.MaxVolumeExtent >= 512) ? 10 : 9;
     hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mipmaps, 0, NULL, D3DPOOL_DEFAULT);
     ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK);
     ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected);