[PATCH v2 5/5] d3dx10: Add support for handling the format field in D3DX10_IMAGE_LOAD_INFO.

[Connor McAdams]

From: Connor McAdams

Signed-off-by: Connor McAdams 
---
 dlls/d3dx10_43/tests/d3dx10.c | 2 +-
 dlls/d3dx10_43/texture.c      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c
index a849d552fde..230f824a24b 100644
--- a/dlls/d3dx10_43/tests/d3dx10.c
+++ b/dlls/d3dx10_43/tests/d3dx10.c
@@ -1060,7 +1060,7 @@ static const struct test_image_load_info
             {
                 8, 8, 1, 1, DXGI_FORMAT_R8G8B8A8_UNORM, { 1, 0 }, D3D10_USAGE_DEFAULT, D3D10_BIND_SHADER_RESOURCE, 0, 0
             }
-        }, .todo_resource_desc = TRUE,
+        }
     },
 };

diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c
index aa056fd40c2..10c939f5e4f 100644
--- a/dlls/d3dx10_43/texture.c
+++ b/dlls/d3dx10_43/texture.c
@@ -660,8 +660,6 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO
         FIXME("load_info->CpuAccessFlags is ignored.\n");
     if (load_info->MiscFlags != D3DX10_DEFAULT)
         FIXME("load_info->MiscFlags is ignored.\n");
-    if (load_info->Format != D3DX10_DEFAULT)
-        FIXME("load_info->Format is ignored.\n");
     if (load_info->Filter != D3DX10_DEFAULT)
         FIXME("load_info->Filter is ignored.\n");
     if (load_info->MipFilter != D3DX10_DEFAULT)
@@ -688,7 +686,8 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO
         goto end;
     }

-    load_info->Format = img_info.Format;
+    if (load_info->Format == D3DX10_DEFAULT || load_info->Format == DXGI_FORMAT_FROM_FILE)
+        load_info->Format = img_info.Format;
     fmt_desc = get_d3dx_pixel_format_info(d3dx_pixel_format_id_from_dxgi_format(load_info->Format));
     if (fmt_desc->format == D3DX_PIXEL_FORMAT_COUNT)
     {