You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 6bb8ca1e25a9cfc66f396b2ae6bc423a8057929c.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From fbbc2b263f3ec7769a2f3b5ab17ae2e841b95876 Mon Sep 17 00:00:00 2001
|
||||
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.
|
||||
@@ -8,12 +8,12 @@ Subject: wined3d: Silence repeated 'Unhandled blend factor 0' messages.
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
|
||||
index 67570d5..1bc2973 100644
|
||||
index 540a1b36174..d7f70545905 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;
|
||||
@@ -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);
|
||||
+ {
|
||||
@@ -25,5 +25,5 @@ index 67570d5..1bc2973 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.3.2
|
||||
2.11.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user