Ivan Gyurdiev : wined3d: Remove bogus address register warning for pixel shaders.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Apr 11 07:43:13 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 12be14b6cc9b883f8cf235c5f39197418e85ec69
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=12be14b6cc9b883f8cf235c5f39197418e85ec69

Author: Ivan Gyurdiev <ivg2 at cornell.edu>
Date:   Tue Apr 11 06:18:59 2006 -0400

wined3d: Remove bogus address register warning for pixel shaders.

Pixel shaders don't have an address register, this warning is bogus.
D3DSPR_ADDR is interpreted as D3DSPR_TEXTURE for pixel shaders.

---

 dlls/wined3d/pixelshader.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 2f898e3..8e80c89 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -965,7 +965,6 @@ inline static VOID IWineD3DPixelShaderIm
     unsigned lineNum = 0; /* The line number of the generated program (for loging)*/
     char *pgmStr = NULL; /* A pointer to the program data generated by this function */
     char  tmpLine[255];
-    DWORD nUseAddressRegister = 0;
 #if 0 /* TODO: loop register (just another address register ) */
     BOOL hasLoops = FALSE;
 #endif
@@ -1112,15 +1111,6 @@ inline static VOID IWineD3DPixelShaderIm
                 case D3DSIO_PHASE:
                     continue;
                 case D3DSIO_MOV:
-                    /* Address registers must be loaded with the ARL instruction */
-                    if ((((*pToken) & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) == D3DSPR_ADDR) {
-                        if (((*pToken) & REGMASK) < nUseAddressRegister) {
-                            strcpy(tmpLine, "ARL");
-                            break;
-                        } else
-                            FIXME("(%p) Try to load A%ld an undeclared address register!\n", This, ((*pToken) & REGMASK));
-                    }
-                    /* fall through */
                 case D3DSIO_CND:
                 case D3DSIO_CMP:
                 case D3DSIO_ADD:




More information about the wine-cvs mailing list