Module: wine Branch: master Commit: 10cbffb3359d87e728d17899a7499ea06f222840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10cbffb3359d87e728d17899a7...
Author: Ivan Gyurdiev ivg231@gmail.com Date: Tue Oct 24 06:05:39 2006 -0400
wined3d: Add D3DBLEND to the WINED3D namespace.
---
dlls/wined3d/device.c | 32 ++++++++++++++++---------------- dlls/wined3d/stateblock.c | 8 ++++---- include/wine/wined3d_types.h | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e93b1de..e4a4253 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3585,29 +3585,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl { int newVal = GL_ZERO; switch (Value) { - case D3DBLEND_ZERO : newVal = GL_ZERO; break; - case D3DBLEND_ONE : newVal = GL_ONE; break; - case D3DBLEND_SRCCOLOR : newVal = GL_SRC_COLOR; break; - case D3DBLEND_INVSRCCOLOR : newVal = GL_ONE_MINUS_SRC_COLOR; break; - case D3DBLEND_SRCALPHA : newVal = GL_SRC_ALPHA; break; - case D3DBLEND_INVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; break; - case D3DBLEND_DESTALPHA : newVal = GL_DST_ALPHA; break; - case D3DBLEND_INVDESTALPHA : newVal = GL_ONE_MINUS_DST_ALPHA; break; - case D3DBLEND_DESTCOLOR : newVal = GL_DST_COLOR; break; - case D3DBLEND_INVDESTCOLOR : newVal = GL_ONE_MINUS_DST_COLOR; break; - case D3DBLEND_SRCALPHASAT : newVal = GL_SRC_ALPHA_SATURATE; break; - - case D3DBLEND_BOTHSRCALPHA : newVal = GL_SRC_ALPHA; + case WINED3DBLEND_ZERO : newVal = GL_ZERO; break; + case WINED3DBLEND_ONE : newVal = GL_ONE; break; + case WINED3DBLEND_SRCCOLOR : newVal = GL_SRC_COLOR; break; + case WINED3DBLEND_INVSRCCOLOR : newVal = GL_ONE_MINUS_SRC_COLOR; break; + case WINED3DBLEND_SRCALPHA : newVal = GL_SRC_ALPHA; break; + case WINED3DBLEND_INVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; break; + case WINED3DBLEND_DESTALPHA : newVal = GL_DST_ALPHA; break; + case WINED3DBLEND_INVDESTALPHA : newVal = GL_ONE_MINUS_DST_ALPHA; break; + case WINED3DBLEND_DESTCOLOR : newVal = GL_DST_COLOR; break; + case WINED3DBLEND_INVDESTCOLOR : newVal = GL_ONE_MINUS_DST_COLOR; break; + case WINED3DBLEND_SRCALPHASAT : newVal = GL_SRC_ALPHA_SATURATE; break; + + case WINED3DBLEND_BOTHSRCALPHA : newVal = GL_SRC_ALPHA; This->srcBlend = newVal; This->dstBlend = newVal; break;
- case D3DBLEND_BOTHINVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; + case WINED3DBLEND_BOTHINVSRCALPHA : newVal = GL_ONE_MINUS_SRC_ALPHA; This->srcBlend = newVal; This->dstBlend = newVal; break; - case D3DBLEND_BLENDFACTOR : newVal = GL_CONSTANT_COLOR; break; - case D3DBLEND_INVBLENDFACTOR : newVal = GL_ONE_MINUS_CONSTANT_COLOR; break; + case WINED3DBLEND_BLENDFACTOR : newVal = GL_CONSTANT_COLOR; break; + case WINED3DBLEND_INVBLENDFACTOR : newVal = GL_ONE_MINUS_CONSTANT_COLOR; break; default: FIXME("Unrecognized src/dest blend value %d (%d)\n", Value, State); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 38bd927..2503c83 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -851,8 +851,8 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_ZWRITEENABLE, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHATESTENABLE, FALSE); IWineD3DDevice_SetRenderState(device, WINED3DRS_LASTPIXEL, TRUE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLEND, D3DBLEND_ONE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLEND, D3DBLEND_ZERO); + IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLEND, WINED3DBLEND_ONE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLEND, WINED3DBLEND_ZERO); IWineD3DDevice_SetRenderState(device, WINED3DRS_CULLMODE, D3DCULL_CCW); IWineD3DDevice_SetRenderState(device, WINED3DRS_ZFUNC, D3DCMP_LESSEQUAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAFUNC, D3DCMP_ALWAYS); @@ -973,8 +973,8 @@ static HRESULT WINAPI IWineD3DStateBloc IWineD3DDevice_SetRenderState(device, WINED3DRS_WRAP14, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_WRAP15, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_SEPARATEALPHABLENDENABLE, FALSE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLENDALPHA, D3DBLEND_ONE); - IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLENDALPHA, D3DBLEND_ZERO); + IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLENDALPHA, WINED3DBLEND_ONE); + IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLENDALPHA, WINED3DBLEND_ZERO); IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOPALPHA, D3DBLENDOP_ADD);
/* clipping status */ diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 2341e94..24d5756 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -442,6 +442,25 @@ typedef enum _WINED3DRENDERSTATETYPE { #define WINEHIGHEST_RENDER_STATE WINED3DRS_BLENDOPALPHA /* Highest WINED3DRS_ value */
+typedef enum _WINED3DBLEND { + WINED3DBLEND_ZERO = 1, + WINED3DBLEND_ONE = 2, + WINED3DBLEND_SRCCOLOR = 3, + WINED3DBLEND_INVSRCCOLOR = 4, + WINED3DBLEND_SRCALPHA = 5, + WINED3DBLEND_INVSRCALPHA = 6, + WINED3DBLEND_DESTALPHA = 7, + WINED3DBLEND_INVDESTALPHA = 8, + WINED3DBLEND_DESTCOLOR = 9, + WINED3DBLEND_INVDESTCOLOR = 10, + WINED3DBLEND_SRCALPHASAT = 11, + WINED3DBLEND_BOTHSRCALPHA = 12, + WINED3DBLEND_BOTHINVSRCALPHA = 13, + WINED3DBLEND_BLENDFACTOR = 14, + WINED3DBLEND_INVBLENDFACTOR = 15, + WINED3DBLEND_FORCE_DWORD = 0x7fffffff +} WINED3DBLEND; + typedef enum _WINED3DVERTEXBLENDFLAGS { WINED3DVBF_DISABLE = 0, WINED3DVBF_1WEIGHTS = 1,
-
Alexandre Julliard