Stefan Dösinger : wined3d: Move the bordercolor to the fragment states.

Alexandre Julliard julliard at winehq.org
Thu Jul 10 08:58:27 CDT 2008


Module: wine
Branch: master
Commit: 1df66c38939fc35d840f569814dadbca7d6e85b2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1df66c38939fc35d840f569814dadbca7d6e85b2

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Wed Jul  2 21:11:21 2008 -0500

wined3d: Move the bordercolor to the fragment states.

---

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

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index b54da6e..bb5b0a7 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3864,7 +3864,7 @@ const struct StateEntry FFPStateTable[] =
     { /* 40, WINED3DRS_EDGEANTIALIAS                */      STATE_RENDER(WINED3DRS_ALPHABLENDENABLE),           NULL                },
     { /* 41, WINED3DRS_COLORKEYENABLE               */      STATE_RENDER(WINED3DRS_ALPHATESTENABLE),            NULL                },
     { /* 42, undefined                              */      0,                                                  state_undefined     },
-    { /* 43, WINED3DRS_BORDERCOLOR                  */      STATE_RENDER(WINED3DRS_BORDERCOLOR),                state_bordercolor   },
+    { /* 43, WINED3DRS_BORDERCOLOR                  */      STATE_RENDER(WINED3DRS_BORDERCOLOR),                NULL                },
     { /* 44, WINED3DRS_TEXTUREADDRESSU              */      0, /* Handled in ddraw */                           state_undefined     },
     { /* 45, WINED3DRS_TEXTUREADDRESSV              */      0, /* Handled in ddraw */                           state_undefined     },
     { /* 46, WINED3DRS_MIPMAPLODBIAS                */      STATE_RENDER(WINED3DRS_MIPMAPLODBIAS),              state_mipmaplodbias },
@@ -5415,6 +5415,7 @@ const struct StateEntryTemplate ffp_fragmentstate_template[] = {
     { STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG),        { STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP),          tex_colorop         }},
     { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT),         { 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl          }},
     { STATE_PIXELSHADER,                                  { STATE_PIXELSHADER,                                  pixelshader         }},
+    { STATE_RENDER(WINED3DRS_BORDERCOLOR),                { STATE_RENDER(WINED3DRS_BORDERCOLOR),                state_bordercolor   }},
     {0 /* Terminate */,                                   { 0,                                                  0                   }},
 };
 




More information about the wine-cvs mailing list