From: Stefan Dösinger <stefan@codeweavers.com>
Date: Tue, 20 Sep 2011 20:18:28 +0000 (+0200)
Subject: d3dx9_36/tests: Account for NP2 limitations in a texture test.
X-Git-Tag: wine-1.3.29~96
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=3b9f88555f222cbded0ce5913f19e6ae5b50e06c;p=wine%2Feterwine.git

d3dx9_36/tests: Account for NP2 limitations in a texture test.
---

diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
index c5753463a0..38b87dbb48 100644
--- a/dlls/d3dx9_36/tests/texture.c
+++ b/dlls/d3dx9_36/tests/texture.c
@@ -100,7 +100,10 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device)
     width = caps.MaxTextureWidth-1;
     hr = D3DXCheckTextureRequirements(device, &width, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT);
     ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK);
-    ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1);
+    if (caps.TextureCaps & D3DPTEXTURECAPS_POW2)
+        ok(width == caps.MaxTextureWidth, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth);
+    else
+        ok(width == caps.MaxTextureWidth-1, "Returned width %d, expected %d\n", width, caps.MaxTextureWidth-1);
 
     /* mipmaps */
     width = 64; height = 63;