From 2a334716c57cdb1a68ccc161aa761e944e6fc3ed Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 15 Feb 2016 09:00:32 +0100 Subject: [PATCH] Merge wined3d-surface_cpu_blt into wined3d-Silence_FIXMEs. --- patches/patchinstall.sh | 18 ++---------------- ...t-FIXME-only-once-in-surface_cpu_blt.patch} | 0 patches/wined3d-Silence_FIXMEs/definition | 1 + patches/wined3d-surface_cpu_blt/definition | 1 - 4 files changed, 3 insertions(+), 17 deletions(-) rename patches/{wined3d-surface_cpu_blt/0001-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch => wined3d-Silence_FIXMEs/0004-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch} (100%) delete mode 100644 patches/wined3d-surface_cpu_blt/definition diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 37990b3d..7e34b6b5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -341,7 +341,6 @@ patch_enable_all () enable_wined3d_Revert_PixelFormat="$1" enable_wined3d_Silence_FIXMEs="$1" enable_wined3d_resource_map="$1" - enable_wined3d_surface_cpu_blt="$1" enable_wined3d_wined3d_swapchain_present="$1" enable_winedevice_Fix_Relocation="$1" enable_winemenubuilder_Desktop_Icon_Path="$1" @@ -1171,9 +1170,6 @@ patch_enable () wined3d-resource_map) enable_wined3d_resource_map="$2" ;; - wined3d-surface_cpu_blt) - enable_wined3d_surface_cpu_blt="$2" - ;; wined3d-wined3d_swapchain_present) enable_wined3d_wined3d_swapchain_present="$2" ;; @@ -6748,27 +6744,17 @@ fi # Patchset wined3d-Silence_FIXMEs # | # | Modified files: -# | * dlls/wined3d/resource.c, dlls/wined3d/state.c +# | * dlls/wined3d/resource.c, dlls/wined3d/state.c, dlls/wined3d/surface.c # | if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then patch_apply wined3d-Silence_FIXMEs/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch patch_apply wined3d-Silence_FIXMEs/0002-wined3d-Display-FIXME-for-cmp-function-0-only-once.patch patch_apply wined3d-Silence_FIXMEs/0003-wined3d-Silence-repeated-resource_check_usage-FIXME.patch + patch_apply wined3d-Silence_FIXMEs/0004-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch ( echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },'; echo '+ { "Christian Costa", "wined3d: Display FIXME for cmp function 0 only once.", 1 },'; echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },'; - ) >> "$patchlist" -fi - -# Patchset wined3d-surface_cpu_blt -# | -# | Modified files: -# | * dlls/wined3d/surface.c -# | -if test "$enable_wined3d_surface_cpu_blt" -eq 1; then - patch_apply wined3d-surface_cpu_blt/0001-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch - ( echo '+ { "Christian Costa", "wined3d: Print FIXME only once in surface_cpu_blt.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/wined3d-surface_cpu_blt/0001-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch b/patches/wined3d-Silence_FIXMEs/0004-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch similarity index 100% rename from patches/wined3d-surface_cpu_blt/0001-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch rename to patches/wined3d-Silence_FIXMEs/0004-wined3d-Print-FIXME-only-once-in-surface_cpu_blt.patch diff --git a/patches/wined3d-Silence_FIXMEs/definition b/patches/wined3d-Silence_FIXMEs/definition index 5d05f260..08d27dae 100644 --- a/patches/wined3d-Silence_FIXMEs/definition +++ b/patches/wined3d-Silence_FIXMEs/definition @@ -1 +1,2 @@ +Fixes: Silence repeated FIXME message in surface_cpu_blt Category: stable diff --git a/patches/wined3d-surface_cpu_blt/definition b/patches/wined3d-surface_cpu_blt/definition deleted file mode 100644 index 9d3b447e..00000000 --- a/patches/wined3d-surface_cpu_blt/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Silence repeated FIXME message in surface_cpu_blt