From 480e4e5bfccb772f5b331406d7e592442105defa Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B3zef=20Kucia?= <joseph.kucia@gmail.com>
Date: Fri, 18 May 2012 15:50:12 +0200
Subject: [PATCH] d3dx9: Correctly check if a cube texture is dynamic in
 D3DXCreateCubeTextureFromFileInMemoryEx.

---
 dlls/d3dx9_36/tests/texture.c | 18 ++++++++++++++++++
 dlls/d3dx9_36/texture.c       |  4 +++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
index f88ea751cc5..a5956717858 100644
--- a/dlls/d3dx9_36/tests/texture.c
+++ b/dlls/d3dx9_36/tests/texture.c
@@ -1290,6 +1290,23 @@ static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device)
     } else skip("Couldn't create cube texture\n");
 }
 
+static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device)
+{
+    HRESULT hr;
+    IDirect3DCubeTexture9 *cube_texture;
+
+    if (!is_autogenmipmap_supported(device, D3DRTYPE_CUBETEXTURE))
+    {
+        skip("No D3DUSAGE_AUTOGENMIPMAP support for cube textures\n");
+        return;
+    }
+
+    hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT,
+        D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture);
+    ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x\n", hr, D3D_OK);
+    if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture);
+}
+
 static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *device)
 {
     HRESULT hr;
@@ -1377,6 +1394,7 @@ START_TEST(texture)
     test_D3DXCreateTextureFromFileInMemory(device);
     test_D3DXCreateTextureFromFileInMemoryEx(device);
     test_D3DXCreateCubeTextureFromFileInMemory(device);
+    test_D3DXCreateCubeTextureFromFileInMemoryEx(device);
     test_D3DXCreateVolumeTextureFromFileInMemory(device);
 
     IDirect3DDevice9_Release(device);
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 2a4a3008a36..750025c6d07 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -1124,6 +1124,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device,
     D3DCAPS9 caps;
     UINT loaded_miplevels;
     D3DXIMAGE_INFO img_info;
+    BOOL dynamic_texture;
     BOOL file_size = FALSE;
     BOOL file_format = FALSE;
     BOOL file_mip_levels = FALSE;
@@ -1191,7 +1192,8 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device,
         mip_levels = img_info.MipLevels;
     }
 
-    if (pool == D3DPOOL_DEFAULT && !((caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && usage == D3DUSAGE_DYNAMIC))
+    dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC);
+    if (pool == D3DPOOL_DEFAULT && !dynamic_texture)
     {
         hr = D3DXCreateCubeTexture(device, size, mip_levels, usage, format, D3DPOOL_SYSTEMMEM, &buftex);
         tex = buftex;
-- 
2.11.4.GIT