[1/2] wined3d: Don't modify the blending parameters in state_blend()

H. Verbeet hverbeet at gmail.com
Mon Jul 23 14:35:15 CDT 2007


Just print a WARN. Based on a patch by Kovács András from a few weeks ago.

Changelog:
  - Don't modify the blending parameters in state_blend()
-------------- next part --------------
---

 dlls/wined3d/state.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index fbd0cd3..3d6101d 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -306,12 +306,10 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D
         glEnable(GL_LINE_SMOOTH);
         checkGLcall("glEnable(GL_LINE_SMOOTH)");
         if(srcBlend != GL_SRC_ALPHA) {
-            FIXME("WINED3DRS_EDGEANTIALIAS enabled, but incompatible src blending param - what to do?\n");
-            srcBlend = GL_SRC_ALPHA;
+            WARN("WINED3DRS_EDGEANTIALIAS enabled, but unexpected src blending param\n");
         }
-        if(dstBlend != GL_ONE_MINUS_SRC_ALPHA) {
-            FIXME("WINED3DRS_EDGEANTIALIAS enabled, but incompatible dst blending param - what to do?\n");
-            dstBlend = GL_ONE_MINUS_SRC_ALPHA;
+        if(dstBlend != GL_ONE_MINUS_SRC_ALPHA && dstBlend != GL_ONE) {
+            WARN("WINED3DRS_EDGEANTIALIAS enabled, but unexpected dst blending param\n");
         }
     } else {
         glDisable(GL_LINE_SMOOTH);


More information about the wine-patches mailing list