Ivan Gyurdiev : wined3d: Add D3DBLENDOP to the WINED3D namespace.

[Alexandre Julliard]

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

Author: Ivan Gyurdiev <ivg231 at gmail.com>
Date:   Sun Oct 29 21:42:14 2006 -0500

wined3d: Add D3DBLENDOP to the WINED3D namespace.

---

 dlls/wined3d/device.c        |   14 +++++++-------
 dlls/wined3d/stateblock.c    |    4 ++--
 include/wine/wined3d_types.h |   10 ++++++++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d11c42b..0dc289f 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3716,14 +3716,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl
         {
             int glParm = GL_FUNC_ADD;
 
-            switch ((D3DBLENDOP) Value) {
-            case D3DBLENDOP_ADD              : glParm = GL_FUNC_ADD;              break;
-            case D3DBLENDOP_SUBTRACT         : glParm = GL_FUNC_SUBTRACT;         break;
-            case D3DBLENDOP_REVSUBTRACT      : glParm = GL_FUNC_REVERSE_SUBTRACT; break;
-            case D3DBLENDOP_MIN              : glParm = GL_MIN;                   break;
-            case D3DBLENDOP_MAX              : glParm = GL_MAX;                   break;
+            switch ((WINED3DBLENDOP) Value) {
+            case WINED3DBLENDOP_ADD              : glParm = GL_FUNC_ADD;              break;
+            case WINED3DBLENDOP_SUBTRACT         : glParm = GL_FUNC_SUBTRACT;         break;
+            case WINED3DBLENDOP_REVSUBTRACT      : glParm = GL_FUNC_REVERSE_SUBTRACT; break;
+            case WINED3DBLENDOP_MIN              : glParm = GL_MIN;                   break;
+            case WINED3DBLENDOP_MAX              : glParm = GL_MAX;                   break;
             default:
-                FIXME("Unrecognized/Unhandled D3DBLENDOP value %d\n", Value);
+                FIXME("Unrecognized/Unhandled WINED3DBLENDOP value %d\n", Value);
             }
 
             if(GL_SUPPORT(EXT_BLEND_MINMAX)) {
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index e1a3b22..509ea38 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -935,7 +935,7 @@ static HRESULT  WINAPI IWineD3DStateBloc
     IWineD3DDevice_SetRenderState(device, WINED3DRS_COLORWRITEENABLE,         0x0000000F);
     tmpfloat.f = 0.0f;
     IWineD3DDevice_SetRenderState(device, WINED3DRS_TWEENFACTOR,              tmpfloat.d);
-    IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOP,                  D3DBLENDOP_ADD);
+    IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOP,                  WINED3DBLENDOP_ADD);
     IWineD3DDevice_SetRenderState(device, WINED3DRS_POSITIONDEGREE,           WINED3DDEGREE_CUBIC);
     IWineD3DDevice_SetRenderState(device, WINED3DRS_NORMALDEGREE,             WINED3DDEGREE_LINEAR);
     /* states new in d3d9 */
@@ -975,7 +975,7 @@ static HRESULT  WINAPI IWineD3DStateBloc
     IWineD3DDevice_SetRenderState(device, WINED3DRS_SEPARATEALPHABLENDENABLE, FALSE);
     IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLENDALPHA,            WINED3DBLEND_ONE);
     IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLENDALPHA,           WINED3DBLEND_ZERO);
-    IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOPALPHA,             D3DBLENDOP_ADD);
+    IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOPALPHA,             WINED3DBLENDOP_ADD);
 
     /* clipping status */
     This->clip_status.ClipUnion = 0;
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 5573463..e627e23 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -461,6 +461,16 @@ typedef enum _WINED3DBLEND {
     WINED3DBLEND_FORCE_DWORD        = 0x7fffffff
 } WINED3DBLEND;
 
+typedef enum _WINED3DBLENDOP {
+    WINED3DBLENDOP_ADD              = 1,
+    WINED3DBLENDOP_SUBTRACT         = 2,
+    WINED3DBLENDOP_REVSUBTRACT      = 3,
+    WINED3DBLENDOP_MIN              = 4,
+    WINED3DBLENDOP_MAX              = 5,
+
+    WINED3DBLENDOP_FORCE_DWORD      = 0x7fffffff
+} WINED3DBLENDOP;
+
 typedef enum _WINED3DVERTEXBLENDFLAGS {
     WINED3DVBF_DISABLE  =   0,
     WINED3DVBF_1WEIGHTS =   1,