Henri Verbeet : wined3d: Remove some unused render states.

Alexandre Julliard julliard at winehq.org
Fri Apr 2 10:17:10 CDT 2010


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Apr  1 21:28:52 2010 +0200

wined3d: Remove some unused render states.

---

 dlls/wined3d/utils.c     |    7 -------
 include/wine/wined3d.idl |    7 -------
 2 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 46252eb..b879f7a 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1497,9 +1497,7 @@ const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) {
 const char* debug_d3drenderstate(DWORD state) {
   switch (state) {
 #define D3DSTATE_TO_STR(u) case u: return #u
-    D3DSTATE_TO_STR(WINED3DRS_TEXTUREHANDLE             );
     D3DSTATE_TO_STR(WINED3DRS_ANTIALIAS                 );
-    D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESS            );
     D3DSTATE_TO_STR(WINED3DRS_TEXTUREPERSPECTIVE        );
     D3DSTATE_TO_STR(WINED3DRS_WRAPU                     );
     D3DSTATE_TO_STR(WINED3DRS_WRAPV                     );
@@ -1513,11 +1511,8 @@ const char* debug_d3drenderstate(DWORD state) {
     D3DSTATE_TO_STR(WINED3DRS_ZWRITEENABLE              );
     D3DSTATE_TO_STR(WINED3DRS_ALPHATESTENABLE           );
     D3DSTATE_TO_STR(WINED3DRS_LASTPIXEL                 );
-    D3DSTATE_TO_STR(WINED3DRS_TEXTUREMAG                );
-    D3DSTATE_TO_STR(WINED3DRS_TEXTUREMIN                );
     D3DSTATE_TO_STR(WINED3DRS_SRCBLEND                  );
     D3DSTATE_TO_STR(WINED3DRS_DESTBLEND                 );
-    D3DSTATE_TO_STR(WINED3DRS_TEXTUREMAPBLEND           );
     D3DSTATE_TO_STR(WINED3DRS_CULLMODE                  );
     D3DSTATE_TO_STR(WINED3DRS_ZFUNC                     );
     D3DSTATE_TO_STR(WINED3DRS_ALPHAREF                  );
@@ -1539,8 +1534,6 @@ const char* debug_d3drenderstate(DWORD state) {
     D3DSTATE_TO_STR(WINED3DRS_EDGEANTIALIAS             );
     D3DSTATE_TO_STR(WINED3DRS_COLORKEYENABLE            );
     D3DSTATE_TO_STR(WINED3DRS_BORDERCOLOR               );
-    D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESSU           );
-    D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESSV           );
     D3DSTATE_TO_STR(WINED3DRS_MIPMAPLODBIAS             );
     D3DSTATE_TO_STR(WINED3DRS_ZBIAS                     );
     D3DSTATE_TO_STR(WINED3DRS_RANGEFOGENABLE            );
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index f784774..d6068f0 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -279,9 +279,7 @@ typedef enum _WINED3DFORMAT
 
 typedef enum _WINED3DRENDERSTATETYPE
 {
-    WINED3DRS_TEXTUREHANDLE                 = 1, /* d3d7 */
     WINED3DRS_ANTIALIAS                     = 2, /* d3d7 */
-    WINED3DRS_TEXTUREADDRESS                = 3, /* d3d7 */
     WINED3DRS_TEXTUREPERSPECTIVE            = 4, /* d3d7 */
     WINED3DRS_WRAPU                         = 5, /* d3d7 */
     WINED3DRS_WRAPV                         = 6, /* d3d7 */
@@ -295,11 +293,8 @@ typedef enum _WINED3DRENDERSTATETYPE
     WINED3DRS_ZWRITEENABLE                  = 14,
     WINED3DRS_ALPHATESTENABLE               = 15,
     WINED3DRS_LASTPIXEL                     = 16,
-    WINED3DRS_TEXTUREMAG                    = 17, /* d3d7 */
-    WINED3DRS_TEXTUREMIN                    = 18, /* d3d7 */
     WINED3DRS_SRCBLEND                      = 19,
     WINED3DRS_DESTBLEND                     = 20,
-    WINED3DRS_TEXTUREMAPBLEND               = 21, /* d3d7 */
     WINED3DRS_CULLMODE                      = 22,
     WINED3DRS_ZFUNC                         = 23,
     WINED3DRS_ALPHAREF                      = 24,
@@ -321,8 +316,6 @@ typedef enum _WINED3DRENDERSTATETYPE
     WINED3DRS_EDGEANTIALIAS                 = 40, /* d3d7, d3d8 */
     WINED3DRS_COLORKEYENABLE                = 41, /* d3d7 */
     WINED3DRS_BORDERCOLOR                   = 43, /* d3d7 */
-    WINED3DRS_TEXTUREADDRESSU               = 44, /* d3d7 */
-    WINED3DRS_TEXTUREADDRESSV               = 45, /* d3d7 */
     WINED3DRS_MIPMAPLODBIAS                 = 46, /* d3d7 */
     WINED3DRS_ZBIAS                         = 47, /* d3d7, d3d8 */
     WINED3DRS_RANGEFOGENABLE                = 48,




More information about the wine-cvs mailing list