From 515f93534d601ec91d0579d04107fafc9184ab24 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 6 Aug 2016 19:47:29 +0200 Subject: [PATCH] wined3d-Silence_FIXMEs: Added patch to silence FIXME in shader_glsl_declare_generic_vertex_attribute. --- patches/patchinstall.sh | 5 +++- ...-wined3d-Silence-false-FIXME-message.patch | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 patches/wined3d-Silence_FIXMEs/0008-wined3d-Silence-false-FIXME-message.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c45166e6..d1649f15 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -7240,7 +7240,8 @@ fi # Patchset wined3d-Silence_FIXMEs # | # | Modified files: -# | * dlls/wined3d/resource.c, dlls/wined3d/state.c, dlls/wined3d/surface.c, dlls/wined3d/swapchain.c, dlls/wined3d/texture.c +# | * dlls/wined3d/glsl_shader.c, dlls/wined3d/resource.c, dlls/wined3d/state.c, dlls/wined3d/surface.c, +# | dlls/wined3d/swapchain.c, dlls/wined3d/texture.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 @@ -7250,6 +7251,7 @@ if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then patch_apply wined3d-Silence_FIXMEs/0005-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch patch_apply wined3d-Silence_FIXMEs/0006-wined3d-Silence-extremely-noisy-FIXME-in-wined3d_tex.patch patch_apply wined3d-Silence_FIXMEs/0007-wined3d-Display-FIXME-only-once-when-blen-op-is-0.patch + patch_apply wined3d-Silence_FIXMEs/0008-wined3d-Silence-false-FIXME-message.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 },'; @@ -7258,6 +7260,7 @@ if test "$enable_wined3d_Silence_FIXMEs" -eq 1; then echo '+ { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },'; echo '+ { "Sebastian Lackner", "wined3d: Silence extremely noisy FIXME in wined3d_texture_add_dirty_region.", 1 },'; echo '+ { "Christian Costa", "wined3d: Display FIXME only once when blen op is 0.", 1 },'; + echo '+ { "Józef Kucia", "wined3d: Silence false FIXME message.", 1 },'; ) >> "$patchlist" fi diff --git a/patches/wined3d-Silence_FIXMEs/0008-wined3d-Silence-false-FIXME-message.patch b/patches/wined3d-Silence_FIXMEs/0008-wined3d-Silence-false-FIXME-message.patch new file mode 100644 index 00000000..7fb832b5 --- /dev/null +++ b/patches/wined3d-Silence_FIXMEs/0008-wined3d-Silence-false-FIXME-message.patch @@ -0,0 +1,30 @@ +From 3bbe012e2a27c6d2d59539b5e12bf92ab2180b77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B3zef=20Kucia?= +Date: Fri, 5 Aug 2016 19:41:41 +0200 +Subject: wined3d: Silence false FIXME message. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Józef Kucia +Signed-off-by: Matteo Bruni +--- + dlls/wined3d/glsl_shader.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c +index 2a03b9f..64c9cec 100644 +--- a/dlls/wined3d/glsl_shader.c ++++ b/dlls/wined3d/glsl_shader.c +@@ -1784,7 +1784,7 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b + index); + return; + } +- if (e->sysval_semantic) ++ if (e->sysval_semantic && e->sysval_semantic != WINED3D_SV_POSITION) + FIXME("Unhandled sysval semantic %#x.\n", e->sysval_semantic); + + if (shader_glsl_use_explicit_attrib_location(gl_info)) +-- +2.9.0 +