wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 8967e87c8a890aed7a81051c2d372f065e825bb2.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-05-25 03:05:27 +02:00
parent 91f6a8ad80
commit 0c46d1e8a2
7 changed files with 133 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/wined3d-Silence_FIXMEs/0001-wined3d-Silence-repeated-Unhandled-blend-factor-0-me.patch
View File

@@ -1,29 +0,0 @@
From 6c46c1e7d4c3ac8fe3482dc7d948b6d4397b6ef7 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
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 540a1b36174..d7f70545905 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -415,8 +415,11 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo
case WINED3D_BLEND_INVSRC1ALPHA:
return GL_ONE_MINUS_SRC1_ALPHA;
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.11.0

29
patches/wined3d-Silence_FIXMEs/0007-wined3d-Display-FIXME-only-once-when-blen-op-is-0.patch
View File

@@ -1,29 +0,0 @@
From dbce3be53546b6d2f9db58c53d8d5376092dc83b Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Sun, 3 Apr 2016 22:30:59 +0200
Subject: wined3d: Display FIXME only once when blen op is 0.
---
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 e5e550e..6ca506b 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -291,8 +291,11 @@ static GLenum gl_blend_op(const struct wined3d_gl_info *gl_info, enum wined3d_bl
case WINED3D_BLEND_OP_MAX:
return gl_info->supported[EXT_BLEND_MINMAX] ? GL_MAX : GL_FUNC_ADD;
default:
- FIXME("Unhandled blend op %#x.\n", op);
+ {
+ static int once;
+ if (op || !once++) FIXME("Unhandled blend op %#x.\n", op);
return GL_FUNC_ADD;
+ }
}
}
--
2.7.1