From b3ca47c689d300ad3397f5341e0f97fdadaa6b47 Mon Sep 17 00:00:00 2001 From: Jason Edmeades Date: Thu, 25 Sep 2003 20:22:40 +0000 Subject: [PATCH] Add real support for VS1.1, ie make the relative addressing mode work. --- dlls/d3d8/shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index deb07422ea8..2dc1a8c158d 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -410,7 +410,7 @@ inline static void vshader_program_dump_param(const DWORD param, int input) { TRACE("V[%lu]", reg); break; case D3DSPR_CONST: - TRACE("C[%s%lu]", (reg & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); + TRACE("C[%s%lu]", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); break; case D3DSPR_ADDR: /*case D3DSPR_TEXTURE:*/ TRACE("a[%lu]", reg); @@ -656,7 +656,7 @@ HRESULT WINAPI IDirect3DVertexShaderImpl_ExecuteSW(IDirect3DVertexShaderImpl* vs p[i] = &input->V[reg]; break; case D3DSPR_CONST: - if (reg & D3DVS_ADDRMODE_RELATIVE) { + if (pToken[i] & D3DVS_ADDRMODE_RELATIVE) { p[i] = &vshader->data->C[(DWORD) A[0].x + reg]; } else { p[i] = &vshader->data->C[reg]; @@ -1050,7 +1050,7 @@ inline static void pshader_program_dump_param(const DWORD param, int input) { TRACE("V[%lu]", reg); break; case D3DSPR_CONST: - TRACE("C[%s%lu]", (reg & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); + TRACE("C[%s%lu]", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); break; case D3DSPR_TEXTURE: /* case D3DSPR_ADDR: */ TRACE("t[%lu]", reg);