H. Verbeet : wined3d: Get rid of any remaining d3d9 stuff in stateblock.c.

[Alexandre Julliard]

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

Author: H. Verbeet 
Date:   Thu Feb 15 13:32:19 2007 +0100

wined3d: Get rid of any remaining d3d9 stuff in stateblock.c.

---

dlls/wined3d/stateblock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 6112f59..7622d8e 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -672,7 +672,7 @@ should really perform a delta so that only the changes get updated*/
         }
     }

-    if (/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED || */ This->blockType == D3DSBT_ALL || This->blockType == D3DSBT_PIXELSTATE) {
+    if (/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED || */ This->blockType == WINED3DSBT_ALL || This->blockType == WINED3DSBT_PIXELSTATE) {

/* Pixel Shader */
         if (This->set.pixelShader && This->changed.pixelShader) {
@@ -829,7 +829,7 @@ should really perform a delta so that only the changes get updated*/
     stateblock_savedstates_copy(iface, &((IWineD3DDeviceImpl*)pDevice)->stateBlock->changed, &This->changed);
     ((IWineD3DDeviceImpl *)pDevice)->stateBlock->lowest_disabled_stage = MAX_TEXTURES - 1;
     for(j = 0; j < MAX_TEXTURES - 1; j++) {
-        if(((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][D3DTSS_COLOROP] == WINED3DTOP_DISABLE) {
+        if(((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) {
             ((IWineD3DDeviceImpl *)pDevice)->stateBlock->lowest_disabled_stage = j;
             break;
         }