From 9a858d4f4cb1433a6a3d6407c382d4644deded68 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 17 Dec 2018 16:26:32 +1100 Subject: [PATCH] Added wined3d-WINED3D_TEXF_ANISOTROPIC patchset --- patches/patchinstall.sh | 19 +++++++++ ...-games-need-WINED3D_TEXF_ANISOTROPIC.patch | 40 +++++++++++++++++++ .../definition | 1 + 3 files changed, 60 insertions(+) create mode 100644 patches/wined3d-WINED3D_TEXF_ANISOTROPIC/0001-wined3d-Multiple-games-need-WINED3D_TEXF_ANISOTROPIC.patch create mode 100644 patches/wined3d-WINED3D_TEXF_ANISOTROPIC/definition diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a7400e63..fd84d79a 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -353,6 +353,7 @@ patch_enable_all () enable_wined3d_UAV_Counters="$1" enable_wined3d_WINED3DFMT_B8G8R8X8_UNORM="$1" enable_wined3d_WINED3D_RS_COLORWRITEENABLE="$1" + enable_wined3d_WINED3D_TEXF_ANISOTROPIC="$1" enable_wined3d_mesa_texture_download="$1" enable_wined3d_wined3d_guess_gl_vendor="$1" enable_winedbg_Process_Arguments="$1" @@ -1216,6 +1217,9 @@ patch_enable () wined3d-WINED3D_RS_COLORWRITEENABLE) enable_wined3d_WINED3D_RS_COLORWRITEENABLE="$2" ;; + wined3d-WINED3D_TEXF_ANISOTROPIC) + enable_wined3d_WINED3D_TEXF_ANISOTROPIC="$2" + ;; wined3d-mesa_texture_download) enable_wined3d_mesa_texture_download="$2" ;; @@ -7135,6 +7139,21 @@ if test "$enable_wined3d_Restore_DirectX10_Support" -eq 1; then ) >> "$patchlist" fi +# Patchset wined3d-WINED3D_TEXF_ANISOTROPIC +# | +# | This patchset fixes the following Wine bugs: +# | * [#41929] wined3d: Multiple games need WINED3D_TEXF_ANISOTROPIC filter mode +# | +# | Modified files: +# | * dlls/wined3d/surface.c +# | +if test "$enable_wined3d_WINED3D_TEXF_ANISOTROPIC" -eq 1; then + patch_apply wined3d-WINED3D_TEXF_ANISOTROPIC/0001-wined3d-Multiple-games-need-WINED3D_TEXF_ANISOTROPIC.patch + ( + printf '%s\n' '+ { "Józef Kucia", "wined3d: Multiple games need WINED3D_TEXF_ANISOTROPIC filter mode.", 1 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-mesa_texture_download # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wined3d-WINED3D_TEXF_ANISOTROPIC/0001-wined3d-Multiple-games-need-WINED3D_TEXF_ANISOTROPIC.patch b/patches/wined3d-WINED3D_TEXF_ANISOTROPIC/0001-wined3d-Multiple-games-need-WINED3D_TEXF_ANISOTROPIC.patch new file mode 100644 index 00000000..d04637a4 --- /dev/null +++ b/patches/wined3d-WINED3D_TEXF_ANISOTROPIC/0001-wined3d-Multiple-games-need-WINED3D_TEXF_ANISOTROPIC.patch @@ -0,0 +1,40 @@ +From 6574972a4ef025a354ebc00b4f1b0c96da3cede0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B3zef=20Kucia?= +Date: Mon, 17 Dec 2018 12:12:20 +1100 +Subject: [PATCH] wined3d: Multiple games need WINED3D_TEXF_ANISOTROPIC filter + mode + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41929 +--- + dlls/wined3d/surface.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c +index 85f9489..3441f01 100644 +--- a/dlls/wined3d/surface.c ++++ b/dlls/wined3d/surface.c +@@ -169,16 +169,16 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 + + switch (filter) + { +- case WINED3D_TEXF_LINEAR: +- gl_filter = GL_LINEAR; ++ case WINED3D_TEXF_NONE: ++ case WINED3D_TEXF_POINT: ++ gl_filter = GL_NEAREST; + break; + + default: + FIXME("Unsupported filter mode %s (%#x).\n", debug_d3dtexturefiltertype(filter), filter); + /* fall through */ +- case WINED3D_TEXF_NONE: +- case WINED3D_TEXF_POINT: +- gl_filter = GL_NEAREST; ++ case WINED3D_TEXF_LINEAR: ++ gl_filter = GL_LINEAR; + break; + } + +-- +1.9.1 + diff --git a/patches/wined3d-WINED3D_TEXF_ANISOTROPIC/definition b/patches/wined3d-WINED3D_TEXF_ANISOTROPIC/definition new file mode 100644 index 00000000..d58e5091 --- /dev/null +++ b/patches/wined3d-WINED3D_TEXF_ANISOTROPIC/definition @@ -0,0 +1 @@ +Fixes: [41929] wined3d: Multiple games need WINED3D_TEXF_ANISOTROPIC filter mode