Francois Gouget : direct3d:
Remove misspelled constants as they exist correctly spelled.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 21 09:40:18 CDT 2007
Module: wine
Branch: master
Commit: d476313a49c1b46eeef390c79cadd72cd3eb217d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d476313a49c1b46eeef390c79cadd72cd3eb217d
Author: Francois Gouget <fgouget at free.fr>
Date: Sun May 20 12:08:40 2007 +0200
direct3d: Remove misspelled constants as they exist correctly spelled.
---
dlls/d3d8/tests/visual.c | 2 +-
dlls/d3d9/tests/visual.c | 2 +-
include/d3d8types.h | 5 -----
include/d3d9types.h | 5 -----
4 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index b8833f2..13df521 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -202,7 +202,7 @@ static void lighting_test(IDirect3DDevice8 *device)
ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %s\n", DXGetErrorString8(hr));
hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE);
ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed with %s\n", DXGetErrorString8(hr));
- hr = IDirect3DDevice8_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLED_RED | D3DCOLORWRITEENABLED_GREEN | D3DCOLORWRITEENABLED_BLUE);
+ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE);
ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed with %s\n", DXGetErrorString8(hr));
hr = IDirect3DDevice8_SetVertexShader(device, fvf);
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 1e1368e..0d7f35f 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -204,7 +204,7 @@ static void lighting_test(IDirect3DDevice9 *device)
ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr));
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE);
ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %s\n", DXGetErrorString9(hr));
- hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLED_RED | D3DCOLORWRITEENABLED_GREEN | D3DCOLORWRITEENABLED_BLUE);
+ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE);
ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %s\n", DXGetErrorString9(hr));
hr = IDirect3DDevice9_SetFVF(device, fvf);
diff --git a/include/d3d8types.h b/include/d3d8types.h
index 9f7f984..d49bd6a 100644
--- a/include/d3d8types.h
+++ b/include/d3d8types.h
@@ -40,11 +40,6 @@
#define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b)
#define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b)
-#define D3DCOLORWRITEENABLED_RED 1
-#define D3DCOLORWRITEENABLED_GREEN 2
-#define D3DCOLORWRITEENABLED_BLUE 4
-#define D3DCOLORWRITEENABLED_ALPHA 8
-
#define D3DCS_LEFT 0x001
#define D3DCS_RIGHT 0x002
#define D3DCS_TOP 0x004
diff --git a/include/d3d9types.h b/include/d3d9types.h
index c0ead88..e99e134 100644
--- a/include/d3d9types.h
+++ b/include/d3d9types.h
@@ -42,11 +42,6 @@
#define D3DCOLOR_XYUV(y,u,v) D3DCOLOR_ARGB(0xFF,y,u,v)
#define D3DCOLOR_AYUV(a,y,u,v) D3DCOLOR_ARGB(a,y,u,v)
-#define D3DCOLORWRITEENABLED_RED 1
-#define D3DCOLORWRITEENABLED_GREEN 2
-#define D3DCOLORWRITEENABLED_BLUE 4
-#define D3DCOLORWRITEENABLED_ALPHA 8
-
#define D3DCS_LEFT 0x001L
#define D3DCS_RIGHT 0x002L
#define D3DCS_TOP 0x004L
More information about the wine-cvs
mailing list