diff --git a/debian/changelog b/debian/changelog index c9184595..e53ced12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ wine-staging (1.7.39) UNRELEASED; urgency=low * Added patch to fix wrong version of ID3DXEffect interface for d3dx9_25. * Added patch to allow to query for d3dx9_26 specific ID3DXEffect interface. * Added patch to modify GetMessage to return already seen messages with higher priority. + * Added patch to silence repeated 'Unhandled blend factor 0' FIXME messages. * Removed patch to avoid hardcoded values for sizeof(GUID) (accepted upstream). * Removed patches for SLGetWindowsInformationDWORD (accepted upstream). -- Sebastian Lackner Mon, 09 Mar 2015 16:52:35 +0100 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d59def24..07e4e60c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -209,6 +209,7 @@ patch_enable_all () enable_wined3d_DXTn="$1" enable_wined3d_Multisampling="$1" enable_wined3d_Revert_PixelFormat="$1" + enable_wined3d_UnhandledBlendFactor="$1" enable_winedevice_Fix_Relocation="$1" enable_winemenubuilder_Desktop_Icon_Path="$1" enable_winepulse_PulseAudio_Support="$1" @@ -674,6 +675,9 @@ patch_enable () wined3d-Revert_PixelFormat) enable_wined3d_Revert_PixelFormat="$2" ;; + wined3d-UnhandledBlendFactor) + enable_wined3d_UnhandledBlendFactor="$2" + ;; winedevice-Fix_Relocation) enable_winedevice_Fix_Relocation="$2" ;; @@ -1799,6 +1803,18 @@ if test "$enable_wined3d_Revert_PixelFormat" -eq 1; then ) >> "$patchlist" fi +# Patchset wined3d-UnhandledBlendFactor +# | +# | Modified files: +# | * dlls/wined3d/state.c +# | +if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then + patch_apply wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch + ( + echo '+ { "Sebastian Lackner", "wined3d: Silence repeated '\''Unhandled blend factor 0'\'' messages.", 1 },'; + ) >> "$patchlist" +fi + # Patchset wined3d-CSMT_Main # | # | This patchset fixes the following Wine bugs: diff --git a/patches/wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch b/patches/wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch new file mode 100644 index 00000000..d99c5ab9 --- /dev/null +++ b/patches/wined3d-UnhandledBlendFactor/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch @@ -0,0 +1,29 @@ +From fbbc2b263f3ec7769a2f3b5ab17ae2e841b95876 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Sun, 15 Mar 2015 01:33:05 +0100 +Subject: wined3d: Silence repeated 'Unhandled blend factor 0' messages. + +--- + dlls/wined3d/state.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c +index 67570d5..1bc2973 100644 +--- a/dlls/wined3d/state.c ++++ b/dlls/wined3d/state.c +@@ -360,8 +360,11 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo + case WINED3D_BLEND_INVBLENDFACTOR: + return GL_ONE_MINUS_CONSTANT_COLOR_EXT; + default: +- FIXME("Unhandled blend factor %#x.\n", factor); ++ { ++ static int once; ++ if (factor || !once++) FIXME("Unhandled blend factor %#x.\n", factor); + return GL_NONE; ++ } + } + } + +-- +2.3.2 +