Connor McAdams : d3dx9: Add support for mipmap generation to D3DXCreateVolumeTextureFromFileInMemoryEx().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 797df8df394d81a165328f9ac6b4039253a78718
URL:    https://gitlab.winehq.org/wine/wine/-/commit/797df8df394d81a165328f9ac6b4039...

Author: Connor McAdams <cmcadams(a)codeweavers.com>
Date:   Wed Jun 19 09:45:46 2024 -0400

d3dx9: Add support for mipmap generation to D3DXCreateVolumeTextureFromFileInMemoryEx().

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>

---

 dlls/d3dx9_36/tests/texture.c | 12 +++++-------
 dlls/d3dx9_36/texture.c       | 13 +++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
index e7362923c80..47ac46e9d3b 100644
--- a/dlls/d3dx9_36/tests/texture.c
+++ b/dlls/d3dx9_36/tests/texture.c
@@ -2550,16 +2550,14 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev
             D3DX_DEFAULT, D3DX_FILTER_POINT, 0, &img_info, NULL, &texture);
     ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
 
-    check_texture_mip_levels(texture, 3, TRUE);
+    check_texture_mip_levels(texture, 3, FALSE);
     check_image_info(&img_info, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_BMP, FALSE);
     check_volume_texture_level_desc(texture, 0, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 4, 4, 1, FALSE);
-    check_volume_texture_level_desc(texture, 1, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 2, 2, 1, TRUE);
-    check_volume_texture_level_desc(texture, 2, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 1, 1, 1, TRUE);
+    check_volume_texture_level_desc(texture, 1, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 2, 2, 1, FALSE);
+    check_volume_texture_level_desc(texture, 2, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 1, 1, 1, FALSE);
 
     for (mip_level = 0; mip_level < 3; ++mip_level)
     {
-        BOOL todo = !!mip_level;
-
         IDirect3DVolumeTexture9_GetLevelDesc(texture, mip_level, &desc);
         get_texture_volume_readback(device, texture, mip_level, &volume_rb);
         for (z = 0; z < desc.Depth; ++z)
@@ -2571,9 +2569,9 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev
                 for (x = 0; x < desc.Width; ++x)
                 {
                     if (desc.Width == 1 || x < (desc.Width / 2))
-                        check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[0], todo);
+                        check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[0], FALSE);
                     else
-                        check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[1], todo);
+                        check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[1], FALSE);
                 }
             }
         }
diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 6f936b4d922..b42c9db3f2d 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -1154,12 +1154,6 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic
         goto err;
     }
 
-    if (mip_levels > image_info.MipLevels)
-    {
-        FIXME("Generation of mipmaps for volume textures is not implemented yet.\n");
-        mip_levels = image_info.MipLevels;
-    }
-
     dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC);
     if (pool == D3DPOOL_DEFAULT && !dynamic_texture)
     {
@@ -1214,6 +1208,13 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic
         goto err;
     }
 
+    hr = D3DXFilterTexture((IDirect3DBaseTexture9 *)tex, palette, loaded_miplevels - 1, mip_filter);
+    if (FAILED(hr))
+    {
+        FIXME("Texture filtering failed.\n");
+        goto err;
+    }
+
     /* Move the data to the actual texture if necessary. */
     if (staging_tex)
     {