From: Connor McAdams cmcadams@codeweavers.com
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/d3dx10_43/texture.c | 3 --- dlls/d3dx9_36/d3dx_helpers.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 7cab0cfc6f2..743472ee97a 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -884,9 +884,6 @@ static HRESULT d3dx_load_texture_data(struct d3dx_image *image, D3DX10_IMAGE_LOA unsigned int i, j; HRESULT hr = S_OK;
- if (img_info->ImageFileFormat == D3DX10_IFF_BMP) - return E_NOTIMPL; - tmp_load_info.Format = img_info->Format; fmt_desc = get_d3dx_pixel_format_info(d3dx_pixel_format_id_from_dxgi_format(tmp_load_info.Format)); if (fmt_desc->format == D3DX_PIXEL_FORMAT_COUNT) diff --git a/dlls/d3dx9_36/d3dx_helpers.c b/dlls/d3dx9_36/d3dx_helpers.c index 20a316c3420..4ece472d39f 100644 --- a/dlls/d3dx9_36/d3dx_helpers.c +++ b/dlls/d3dx9_36/d3dx_helpers.c @@ -1500,7 +1500,8 @@ static HRESULT d3dx_initialize_image_from_wic(const void *src_data, uint32_t src break; }
- if (image_is_argb(bitmap_frame, image)) + /* D3DX10/D3DX11 ignore alpha channels in X8 bitmaps. */ + if (!(flags & D3DX_IMAGE_SUPPORT_DXT10) && image_is_argb(bitmap_frame, image)) image->format = D3DX_PIXEL_FORMAT_B8G8R8A8_UNORM;
if (!(flags & D3DX_IMAGE_INFO_ONLY))