diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 444292e0..b7633e52 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -320,7 +320,6 @@ patch_enable_all () enable_wined3d_DXTn="$1" enable_wined3d_Dual_Source_Blending="$1" enable_wined3d_Indexed_Vertex_Blending="$1" - enable_wined3d_Restore_DirectX10_Support="$1" enable_wined3d_SWVP_shaders="$1" enable_wined3d_Silence_FIXMEs="$1" enable_wined3d_UAV_Counters="$1" @@ -1089,9 +1088,6 @@ patch_enable () wined3d-Indexed_Vertex_Blending) enable_wined3d_Indexed_Vertex_Blending="$2" ;; - wined3d-Restore-DirectX10-Support) - enable_wined3d_Restore_DirectX10_Support="$2" - ;; wined3d-SWVP-shaders) enable_wined3d_SWVP_shaders="$2" ;; @@ -4339,7 +4335,7 @@ fi # Patchset libs-Debug_Channel # | # | Modified files: -# | * libs/wine/debug.c +# | * dlls/ntdll/debugtools.c # | if test "$enable_libs_Debug_Channel" -eq 1; then patch_apply libs-Debug_Channel/0001-libwine-Add-process-specific-debug-channels.patch @@ -6649,21 +6645,6 @@ if test "$enable_wined3d_Indexed_Vertex_Blending" -eq 1; then ) >> "$patchlist" fi -# Patchset wined3d-Restore-DirectX10-Support -# | -# | This patchset fixes the following Wine bugs: -# | * [#45975] Allow Direct 10 to work with legacy nVidia drivers. -# | -# | Modified files: -# | * dlls/wined3d/adapter_gl.c -# | -if test "$enable_wined3d_Restore_DirectX10_Support" -eq 1; then - patch_apply wined3d-Restore-DirectX10-Support/0001-wined3d-Remove-check-for-Polygon-offset-clamping.patch - ( - printf '%s\n' '+ { "Alistair Leslie-Hughes", "wined3d: Remove check for Polygon offset clamping.", 1 },'; - ) >> "$patchlist" -fi - # Patchset wined3d-Silence_FIXMEs # | # | Modified files: diff --git a/patches/wined3d-Restore-DirectX10-Support/0001-wined3d-Remove-check-for-Polygon-offset-clamping.patch b/patches/wined3d-Restore-DirectX10-Support/0001-wined3d-Remove-check-for-Polygon-offset-clamping.patch deleted file mode 100644 index 81fc92a2..00000000 --- a/patches/wined3d-Restore-DirectX10-Support/0001-wined3d-Remove-check-for-Polygon-offset-clamping.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d547ae9d290fb24f975bafcf462288d6f7bf3b1f Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Fri, 12 Oct 2018 13:18:56 +1100 -Subject: [PATCH] wined3d: Remove check for Polygon offset clamping - -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45975 ---- - dlls/wined3d/adapter_gl.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c -index 16a26b8..2af165d 100644 ---- a/dlls/wined3d/adapter_gl.c -+++ b/dlls/wined3d/adapter_gl.c -@@ -1255,8 +1255,14 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g - shader_model = min(shader_model, max(shader_caps->hs_version, 4)); - shader_model = min(shader_model, max(shader_caps->ds_version, 4)); - -+ /* -+ * Legacy nVidia driver doesn't the the ARB_POLYGON_OFFSET_CLAMP support. -+ * There is an implied support for Depth Bias Clamping in DirectX 10 but no real documenation for either case -+ * On the same hardware, on windows, it supports DirectX 10 without the need for this extension, So -+ * removing this check and users can deal with the fact they might have minor artifacts from time to time. -+ */ - if (gl_info->supported[WINED3D_GL_VERSION_3_2] -- && gl_info->supported[ARB_POLYGON_OFFSET_CLAMP] -+/* && gl_info->supported[ARB_POLYGON_OFFSET_CLAMP]*/ - && gl_info->supported[ARB_SAMPLER_OBJECTS]) - { - if (shader_model >= 5 --- -1.9.1 - diff --git a/patches/wined3d-Restore-DirectX10-Support/definition b/patches/wined3d-Restore-DirectX10-Support/definition deleted file mode 100644 index bf10ffa4..00000000 --- a/patches/wined3d-Restore-DirectX10-Support/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [45975] Allow Direct 10 to work with legacy nVidia drivers.