From e8ba733706fecd1710a60f28e4f724dd092a5c75 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 5 Jan 2009 10:10:16 +0100 Subject: [PATCH] wined3d: Remove unused enum elements from WINED3DTEXTURESTAGESTATETYPE. --- dlls/wined3d/device.c | 1 - dlls/wined3d/stateblock.c | 1 - dlls/wined3d/utils.c | 1 - include/wine/wined3d.idl | 11 ----------- 4 files changed, 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 212184cfcef..b5f2b3ecb9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7571,7 +7571,6 @@ const DWORD SavedPixelStates_R[NUM_SAVEDPIXELSTATES_R] = { }; const DWORD SavedPixelStates_T[NUM_SAVEDPIXELSTATES_T] = { - WINED3DTSS_ADDRESSW , WINED3DTSS_ALPHAARG0 , WINED3DTSS_ALPHAARG1 , WINED3DTSS_ALPHAARG2 , diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 445e281a6b3..81614b4e522 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1240,7 +1240,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat This->textureState[i][WINED3DTSS_BUMPENVLSCALE ] = 0; This->textureState[i][WINED3DTSS_BUMPENVLOFFSET ] = 0; This->textureState[i][WINED3DTSS_TEXTURETRANSFORMFLAGS ] = WINED3DTTFF_DISABLE; - This->textureState[i][WINED3DTSS_ADDRESSW ] = WINED3DTADDRESS_WRAP; This->textureState[i][WINED3DTSS_COLORARG0 ] = WINED3DTA_CURRENT; This->textureState[i][WINED3DTSS_ALPHAARG0 ] = WINED3DTA_CURRENT; This->textureState[i][WINED3DTSS_RESULTARG ] = WINED3DTA_CURRENT; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8cf8ee0cf7d..4bfa453d14f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1020,7 +1020,6 @@ const char* debug_d3dtexturestate(DWORD state) { D3DSTATE_TO_STR(WINED3DTSS_BUMPENVLSCALE ); D3DSTATE_TO_STR(WINED3DTSS_BUMPENVLOFFSET ); D3DSTATE_TO_STR(WINED3DTSS_TEXTURETRANSFORMFLAGS ); - D3DSTATE_TO_STR(WINED3DTSS_ADDRESSW ); D3DSTATE_TO_STR(WINED3DTSS_COLORARG0 ); D3DSTATE_TO_STR(WINED3DTSS_ALPHAARG0 ); D3DSTATE_TO_STR(WINED3DTSS_RESULTARG ); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 422673e68a4..4c89a4d8718 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -565,20 +565,9 @@ typedef enum _WINED3DTEXTURESTAGESTATETYPE WINED3DTSS_BUMPENVMAT10 = 9, WINED3DTSS_BUMPENVMAT11 = 10, WINED3DTSS_TEXCOORDINDEX = 11, - WINED3DTSS_ADDRESS = 12, - WINED3DTSS_ADDRESSU = 13, - WINED3DTSS_ADDRESSV = 14, - WINED3DTSS_BORDERCOLOR = 15, - WINED3DTSS_MAGFILTER = 16, - WINED3DTSS_MINFILTER = 17, - WINED3DTSS_MIPFILTER = 18, - WINED3DTSS_MIPMAPLODBIAS = 19, - WINED3DTSS_MAXMIPLEVEL = 20, - WINED3DTSS_MAXANISOTROPY = 21, WINED3DTSS_BUMPENVLSCALE = 22, WINED3DTSS_BUMPENVLOFFSET = 23, WINED3DTSS_TEXTURETRANSFORMFLAGS = 24, - WINED3DTSS_ADDRESSW = 25, WINED3DTSS_COLORARG0 = 26, WINED3DTSS_ALPHAARG0 = 27, WINED3DTSS_RESULTARG = 28,