diff --git a/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0010-d3dx10-Handle-filter-value-passed-in-via-D3DX10_IMAG.patch b/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0010-d3dx10-Handle-filter-value-passed-in-via-D3DX10_IMAG.patch index 3ac6c3fd..110d1c23 100644 --- a/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0010-d3dx10-Handle-filter-value-passed-in-via-D3DX10_IMAG.patch +++ b/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0010-d3dx10-Handle-filter-value-passed-in-via-D3DX10_IMAG.patch @@ -1,4 +1,4 @@ -From 24011cea5836f9b2b4cecbf971fe4b6400ebb9d5 Mon Sep 17 00:00:00 2001 +From d86d4e9d383a5853fc494f3bb2bcdfb40c75761e Mon Sep 17 00:00:00 2001 From: Connor McAdams Date: Thu, 18 Sep 2025 11:42:06 -0400 Subject: [PATCH] d3dx10: Handle filter value passed in via @@ -15,7 +15,7 @@ Signed-off-by: Connor McAdams 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c -index 818889138a5..4be5d37d70d 100644 +index 2287e14d36e..083e1ebd628 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1086,7 +1086,7 @@ static const struct test_invalid_image_load_info @@ -28,10 +28,10 @@ index 818889138a5..4be5d37d70d 100644 /* Invalid mipfilter value, only checked if mips are generated. */ { diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c -index a21ce7ff139..bb1e1456fc2 100644 +index 97cccc45223..3ff0b136c0c 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c -@@ -665,12 +665,18 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO +@@ -666,12 +666,18 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO FIXME("load_info->MiscFlags is ignored.\n"); if (load_info->Format != D3DX10_DEFAULT) FIXME("load_info->Format is ignored.\n"); @@ -52,7 +52,7 @@ index a21ce7ff139..bb1e1456fc2 100644 hr = d3dx_image_init(data, size, &image, 0, D3DX_IMAGE_SUPPORT_DXT10); if (FAILED(hr)) return E_FAIL; -@@ -741,7 +747,7 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO +@@ -742,7 +748,7 @@ HRESULT load_texture_data(const void *data, SIZE_T size, D3DX10_IMAGE_LOAD_INFO set_d3dx_pixels(&dst_pixels, pixels_buffer, dst_row_pitch, dst_slice_pitch, NULL, dst_size.width, dst_size.height, dst_size.depth, &unaligned_rect); @@ -88,7 +88,7 @@ index 655529b004b..394b1a1cee2 100644 BOOL d3dximage_info_from_d3dx_image(D3DXIMAGE_INFO *info, struct d3dx_image *image); diff --git a/dlls/d3dx9_36/d3dx_helpers.c b/dlls/d3dx9_36/d3dx_helpers.c -index 13ecc81018d..ddd208913af 100644 +index 7cf4123fb15..5b489f7e974 100644 --- a/dlls/d3dx9_36/d3dx_helpers.c +++ b/dlls/d3dx9_36/d3dx_helpers.c @@ -53,6 +53,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -108,11 +108,11 @@ index 13ecc81018d..ddd208913af 100644 /************************************************************ diff --git a/dlls/d3dx9_36/d3dx_helpers.h b/dlls/d3dx9_36/d3dx_helpers.h -index 663febd279b..c7292990799 100644 +index 42b40c1c279..83c213db311 100644 --- a/dlls/d3dx9_36/d3dx_helpers.h +++ b/dlls/d3dx9_36/d3dx_helpers.h -@@ -386,6 +386,8 @@ static inline BOOL is_conversion_to_supported(const struct pixel_format_desc *fo - return !is_index_format(format) && !is_packed_format(format) && !is_unknown_format(format); +@@ -394,6 +394,8 @@ static inline BOOL is_conversion_to_supported(const struct pixel_format_desc *fo + && !is_unknown_format(format); } +HRESULT d3dx_validate_filter(uint32_t filter); @@ -121,7 +121,7 @@ index 663febd279b..c7292990799 100644 void format_to_d3dx_color(const struct pixel_format_desc *format, const BYTE *src, const PALETTEENTRY *palette, diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c -index 02bfbca2cc6..c64f9564406 100644 +index 2896bd1f2b6..0873b686497 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -59,7 +59,7 @@ HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture, diff --git a/staging/upstream-commit b/staging/upstream-commit index 1d8a45eb..a3da9b43 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -0abb419016e3a38e36ba0bdfe9c0497a29a86fcf +fc70990d579a74974c6e4f1550f892188114f5cf