Matteo Bruni : d3dx9/tests: Fix expected values when mipmaps on cube maps are not supported.

[Alexandre Julliard]

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

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

d3dx9/tests: Fix expected values when mipmaps on cube maps are not supported.

---

 dlls/d3dx9_36/tests/texture.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
index 16cb0e5..fb73bfb 100644
--- a/dlls/d3dx9_36/tests/texture.c
+++ b/dlls/d3dx9_36/tests/texture.c
@@ -402,6 +402,7 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device)
     size = 284;
     mipmaps = 20;
     expected = caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2 ? 10 : 9;
+    expected = caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP ? expected : 1;
     hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT);
     ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK);
     ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected);
@@ -409,6 +410,7 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device)
     size = 63;
     mipmaps = 9;
     expected = caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2 ? 7 : 6;
+    expected = caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP ? expected : 1;
     hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT);
     ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK);
     ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected);