May 2006 - Wine-Commits - list.winehq.org

Ivan Gyurdiev : wined3d: Modify shader_dump_param() to take into account address token.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 746d1b1cd3e8d577d8a8259171a9daa778f74e00 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=746d1b1cd3e8d577d8a8259… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 02:05:49 2006 -0400 wined3d: Modify shader_dump_param() to take into account address token. Currently we hardcode a0.x, which I think is correct for shaders 1.0. However, for shaders 2.0, we must look into the address token, and print the register there. Handle both cases to correct the trace. --- dlls/wined3d/baseshader.c | 36 +++++++++++++++++++++++++++++++----- dlls/wined3d/pixelshader.c | 6 +++--- dlls/wined3d/vertexshader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f69f0ab..1af6a71 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -146,7 +146,7 @@ int shader_skip_unrecognized( FIXME("Unrecognized opcode param: token=%08lX " "addr_token=%08lX name=", param, addr_token); - shader_dump_param(iface, param, i); + shader_dump_param(iface, param, addr_token, i); FIXME("\n"); ++i; } @@ -306,9 +306,31 @@ void shader_program_dump_decl_usage( } } +static void shader_dump_arr_entry( + IWineD3DBaseShader *iface, + const DWORD param, + const DWORD addr_token, + int input) { + + DWORD reg = param & D3DSP_REGNUM_MASK; + char relative = + ((param & D3DSHADER_ADDRESSMODE_MASK) == D3DSHADER_ADDRMODE_RELATIVE); + + TRACE("["); + if (relative) { + if (addr_token) + shader_dump_param(iface, addr_token, 0, input); + else + TRACE("a0.x"); + TRACE(" + "); + } + TRACE("%lu]", reg); +} + void shader_dump_param( IWineD3DBaseShader *iface, const DWORD param, + const DWORD addr_token, int input) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; @@ -347,7 +369,8 @@ void shader_dump_param( TRACE("v%lu", reg); break; case D3DSPR_CONST: - TRACE("c%s%lu", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); + TRACE("c"); + shader_dump_arr_entry(iface, param, addr_token, input); break; case D3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */ TRACE("%c%lu", (pshader? 't':'a'), reg); @@ -368,16 +391,19 @@ void shader_dump_param( TRACE("oT%lu", reg); break; case D3DSPR_CONSTINT: - TRACE("i%s%lu", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); + TRACE("i"); + shader_dump_arr_entry(iface, param, addr_token, input); break; case D3DSPR_CONSTBOOL: - TRACE("b%s%lu", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); + TRACE("b"); + shader_dump_arr_entry(iface, param, addr_token, input); break; case D3DSPR_LABEL: TRACE("l%lu", reg); break; case D3DSPR_LOOP: - TRACE("aL%s%lu", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); + TRACE("aL"); + shader_dump_arr_entry(iface, param, addr_token, input); break; case D3DSPR_SAMPLER: TRACE("s%lu", reg); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index afee2fd..6ff64b3 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1427,7 +1427,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param((IWineD3DBaseShader*) This, param, 0); + shader_dump_param((IWineD3DBaseShader*) This, param, 0, 0); pToken += 2; len += 2; @@ -1463,7 +1463,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param((IWineD3DBaseShader*) This, param, 0); + shader_dump_param((IWineD3DBaseShader*) This, param, addr_token, 0); for (i = 1; i < curOpcode->num_params; ++i) { @@ -1473,7 +1473,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S len += tokens_read; TRACE(", "); - shader_dump_param((IWineD3DBaseShader*) This, param, 1); + shader_dump_param((IWineD3DBaseShader*) This, param, addr_token, 1); } } } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 9b46866..b3d17b5 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1549,7 +1549,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ shader_program_dump_decl_usage(usage, param); shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param((IWineD3DBaseShader*) This, param, 0); + shader_dump_param((IWineD3DBaseShader*) This, param, 0, 0); pToken += 2; len += 2; @@ -1585,7 +1585,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param((IWineD3DBaseShader*) This, param, 0); + shader_dump_param((IWineD3DBaseShader*) This, param, addr_token, 0); for (i = 1; i < curOpcode->num_params; ++i) { @@ -1595,7 +1595,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ len += tokens_read; TRACE(", "); - shader_dump_param((IWineD3DBaseShader*) This, param, 1); + shader_dump_param((IWineD3DBaseShader*) This, param, addr_token, 1); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1227b3f..7a61921 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1372,6 +1372,7 @@ extern void shader_dump_ins_modifiers( extern void shader_dump_param( IWineD3DBaseShader *iface, const DWORD param, + const DWORD addr_token, int input); extern int shader_get_param(

1 0

Ivan Gyurdiev : wined3d: Use shader_get_param() in trace pass, reg. count pass, generation pass.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 03b67e3030092f4fb33548b95b200da1cf08e80d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03b67e3030092f4fb33548b… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 02:04:30 2006 -0400 wined3d: Use shader_get_param() in trace pass, reg. count pass, generation pass. Change the trace pass, the register counting pass, and the hw generator pass to take into account the new get_params() function. For hw generation, store the address tokens into the SHADER_OPCODE_ARG structure, so they're available to generator functions. --- dlls/wined3d/baseshader.c | 42 +++++++++++++++++++++++++++++++--------- dlls/wined3d/pixelshader.c | 28 ++++++++++++++++++++------- dlls/wined3d/vertexshader.c | 28 ++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 77 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index abf5019..f69f0ab 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -4,6 +4,7 @@ * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira * Copyright 2005 Oliver Stieber + * Copyright 2006 Ivan Gyurdiev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -214,13 +215,17 @@ void shader_get_registers_used( int i; for (i = 0; i < curOpcode->num_params; ++i) { - DWORD regtype = (((*pToken) & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); - DWORD reg = (*pToken) & D3DSP_REGNUM_MASK; + + DWORD param, addr_token, reg, regtype; + pToken += shader_get_param(iface, pToken, &param, &addr_token); + + regtype = (param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT; + reg = param & D3DSP_REGNUM_MASK; + if (D3DSPR_TEXTURE == regtype) *texUsed |= (1 << reg); if (D3DSPR_TEMP == regtype) *tempsUsed |= (1 << reg); - ++pToken; } } } @@ -563,12 +568,33 @@ void generate_base_shader( hw_arg.shader = iface; hw_arg.opcode = curOpcode; hw_arg.buffer = buffer; + if (curOpcode->num_params > 0) { - hw_arg.dst = *pToken; - /* FIXME: this does not account for relative address tokens */ - for (i = 1; i < curOpcode->num_params; i++) - hw_arg.src[i-1] = *(pToken + i); + DWORD param, addr_token = 0; + + /* DCL instruction has usage dst parameter, not register */ + if (curOpcode->opcode == D3DSIO_DCL) + param = *pToken++; + else + pToken += shader_get_param(iface, pToken, &param, &addr_token); + + hw_arg.dst = param; + hw_arg.dst_addr = addr_token; + + for (i = 1; i < curOpcode->num_params; i++) { + /* DEF* instructions have constant src parameters, not registers */ + if (curOpcode->opcode == D3DSIO_DEF || + curOpcode->opcode == D3DSIO_DEFI || + curOpcode->opcode == D3DSIO_DEFB) { + param = *pToken++; + + } else + pToken += shader_get_param(iface, pToken, &param, &addr_token); + + hw_arg.src[i-1] = param; + hw_arg.src_addr[i-1] = addr_token; + } } /* Call appropriate function for output target */ @@ -577,8 +603,6 @@ void generate_base_shader( else curOpcode->hw_fct(&hw_arg); - pToken += curOpcode->num_params; - } else { /* Unless we encounter a no-op command, this opcode is unrecognized */ diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 4c109e2..afee2fd 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -4,6 +4,7 @@ * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira * Copyright 2005 Oliver Stieber + * Copyright 2006 Ivan Gyurdiev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1448,18 +1449,31 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S ++pToken; ++len; } else { + + DWORD param, addr_token; + int tokens_read; + TRACE("%s", curOpcode->name); if (curOpcode->num_params > 0) { - shader_dump_ins_modifiers(*pToken); + + tokens_read = shader_get_param((IWineD3DBaseShader*) This, + pToken, &param, &addr_token); + pToken += tokens_read; + len += tokens_read; + + shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param((IWineD3DBaseShader*) This, *pToken, 0); - ++pToken; - ++len; + shader_dump_param((IWineD3DBaseShader*) This, param, 0); + for (i = 1; i < curOpcode->num_params; ++i) { + + tokens_read = shader_get_param((IWineD3DBaseShader*) This, + pToken, &param, &addr_token); + pToken += tokens_read; + len += tokens_read; + TRACE(", "); - shader_dump_param((IWineD3DBaseShader*) This, *pToken, 1); - ++pToken; - ++len; + shader_dump_param((IWineD3DBaseShader*) This, param, 1); } } } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index fc68c71..9b46866 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -4,6 +4,7 @@ * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira * Copyright 2005 Oliver Stieber + * Copyright 2006 Ivan Gyurdiev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1570,18 +1571,31 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ ++pToken; ++len; } else { + + DWORD param, addr_token; + int tokens_read; + TRACE("%s", curOpcode->name); if (curOpcode->num_params > 0) { - shader_dump_ins_modifiers(*pToken); + + tokens_read = shader_get_param((IWineD3DBaseShader*) This, + pToken, &param, &addr_token); + pToken += tokens_read; + len += tokens_read; + + shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param((IWineD3DBaseShader*) This, *pToken, 0); - ++pToken; - ++len; + shader_dump_param((IWineD3DBaseShader*) This, param, 0); + for (i = 1; i < curOpcode->num_params; ++i) { + + tokens_read = shader_get_param((IWineD3DBaseShader*) This, + pToken, &param, &addr_token); + pToken += tokens_read; + len += tokens_read; + TRACE(", "); - shader_dump_param((IWineD3DBaseShader*) This, *pToken, 1); - ++pToken; - ++len; + shader_dump_param((IWineD3DBaseShader*) This, param, 1); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34d512e..1227b3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1295,7 +1295,9 @@ typedef struct SHADER_OPCODE_ARG { IWineD3DBaseShader* shader; CONST SHADER_OPCODE* opcode; DWORD dst; + DWORD dst_addr; DWORD src[4]; + DWORD src_addr[4]; SHADER_BUFFER* buffer; } SHADER_OPCODE_ARG;

1 0

Ivan Gyurdiev : wined3d: Add shader_get_param() fn, which processes address tokens.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 404eff792fc679cca6040163a8b1cc643b75b608 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=404eff792fc679cca604016… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 02:02:36 2006 -0400 wined3d: Add shader_get_param() fn, which processes address tokens. Add a new function to process parameters. On shaders 1.0, processing parameters amounts to *pToken++. On shaders 2.0+, we have a relative addressing token to account for. This function should be used, instead of relying on num_params everywhere. --- dlls/wined3d/baseshader.c | 61 +++++++++++++++++++++++++++++++++++++--- dlls/wined3d/pixelshader.c | 21 ++++++-------- dlls/wined3d/vertexshader.c | 48 ++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 10 +++++++ 4 files changed, 96 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 6ea5e9d..abf5019 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -85,6 +85,29 @@ const SHADER_OPCODE* shader_get_opcode( return NULL; } +/* Read a parameter opcode from the input stream, + * and possibly a relative addressing token. + * Return the number of tokens read */ +int shader_get_param( + IWineD3DBaseShader* iface, + const DWORD* pToken, + DWORD* param, + DWORD* addr_token) { + + /* PS >= 3.0 have relative addressing (with token) + * VS >= 2.0 have relative addressing (with token) + * VS >= 1.0 < 2.0 have relative addressing (without token) + * The version check below should work in general */ + + IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; + char rel_token = D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2 && + ((*pToken & D3DSHADER_ADDRESSMODE_MASK) == D3DSHADER_ADDRMODE_RELATIVE); + + *param = *pToken; + *addr_token = rel_token? *(pToken + 1): 0; + return rel_token? 2:1; +} + /* Return the number of parameters to skip for an opcode */ static inline int shader_skip_opcode( IWineD3DBaseShaderImpl* This, @@ -99,6 +122,36 @@ static inline int shader_skip_opcode( curOpcode->num_params; } +/* Read the parameters of an unrecognized opcode from the input stream + * Return the number of tokens read. + * + * Note: This function assumes source or destination token format. + * It will not work with specially-formatted tokens like DEF or DCL, + * but hopefully those would be recognized */ + +int shader_skip_unrecognized( + IWineD3DBaseShader* iface, + const DWORD* pToken) { + + int tokens_read = 0; + int i = 0; + + /* TODO: Think of a good name for 0x80000000 and replace it with a constant */ + while (*pToken & 0x80000000) { + + DWORD param, addr_token; + tokens_read += shader_get_param(iface, pToken, &param, &addr_token); + pToken += tokens_read; + + FIXME("Unrecognized opcode param: token=%08lX " + "addr_token=%08lX name=", param, addr_token); + shader_dump_param(iface, param, i); + FIXME("\n"); + ++i; + } + return tokens_read; +} + /* Note: For vertex shaders, * texUsed = addrUsed, and * D3DSPR_TEXTURE = D3DSPR_ADDR. @@ -484,11 +537,9 @@ void generate_base_shader( curOpcode = shader_get_opcode(iface, opcode_token); /* Unknown opcode and its parameters */ - if (NULL == curOpcode) { - while (*pToken & 0x80000000) { /* TODO: Think of a sensible name for 0x80000000 */ - FIXME("unrecognized opcode: %08lx\n", *pToken); - ++pToken; - } + if (NULL == curOpcode) { + FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); + pToken += shader_skip_unrecognized(iface, pToken); /* Using GLSL & no generator function exists */ } else if (USING_GLSL && curOpcode->hw_glsl_fct == NULL) { diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 99c1fc9..4c109e2 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1376,6 +1376,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; const DWORD* pToken = pFunction; const SHADER_OPCODE *curOpcode = NULL; + DWORD opcode_token; DWORD len = 0; DWORD i; TRACE("(%p) : Parsing programme\n", This); @@ -1399,20 +1400,16 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S if (!This->baseShader.version) { WARN("(%p) : pixel shader doesn't have a valid version identifier\n", This); } - curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); - ++pToken; - ++len; + opcode_token = *pToken++; + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, opcode_token); + len++; if (NULL == curOpcode) { + int tokens_read; - /* TODO: Think of a good name for 0x80000000 and replace it with a constant */ - while (*pToken & 0x80000000) { - - /* unknown current opcode ... */ - TRACE("unrecognized opcode: %08lx", *pToken); - ++pToken; - ++len; - TRACE("\n"); - } + FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); + tokens_read = shader_skip_unrecognized((IWineD3DBaseShader*) This, pToken); + pToken += tokens_read; + len += tokens_read; } else { if (curOpcode->opcode == D3DSIO_DCL) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 4c8eb14..fc68c71 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1116,7 +1116,8 @@ BOOL IWineD3DVertexShaderImpl_ExecuteHAL HRESULT WINAPI IWineD3DVertexShaderImpl_ExecuteSW(IWineD3DVertexShader* iface, WINEVSHADERINPUTDATA* input, WINEVSHADEROUTPUTDATA* output) { IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface; - + DWORD opcode_token; + /** Vertex Shader Temporary Registers */ WINED3DSHADERVECTOR R[12]; /*D3DSHADERSCALAR A0;*/ @@ -1175,23 +1176,15 @@ #endif pToken += comment_len; continue ; } - curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); - ++pToken; + + opcode_token = *pToken++; + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, opcode_token); + if (NULL == curOpcode) { - i = 0; - /* unknown current opcode ... */ - /* TODO: Think of a name for 0x80000000 and replace its use with a constant */ - while (*pToken & 0x80000000) { - if (i == 0) { - FIXME("unrecognized opcode: pos=%d token=%08lX\n", (pToken - 1) - This->baseShader.function, *(pToken - 1)); - } - FIXME("unrecognized opcode param: pos=%d token=%08lX what=", pToken - This->baseShader.function, *pToken); - shader_dump_param((IWineD3DBaseShader*) This, *pToken, i); - TRACE("\n"); - ++i; - ++pToken; - } + FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); + pToken += shader_skip_unrecognized((IWineD3DBaseShader*) This, pToken); /* return FALSE; */ + } else { if (curOpcode->num_params > 0) { /* TRACE(">> execting opcode: pos=%d opcode_name=%s token=%08lX\n", pToken - vshader->function, curOpcode->name, *pToken); */ @@ -1505,6 +1498,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ IWineD3DVertexShaderImpl *This =(IWineD3DVertexShaderImpl *)iface; const DWORD* pToken = pFunction; const SHADER_OPCODE* curOpcode = NULL; + DWORD opcode_token; DWORD len = 0; DWORD i; TRACE("(%p) : Parsing programme\n", This); @@ -1531,18 +1525,18 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ len += comment_len + 1; continue; } - curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, *pToken); - ++pToken; - ++len; + + opcode_token = *pToken++; + curOpcode = shader_get_opcode((IWineD3DBaseShader*) This, opcode_token); + len++; + if (NULL == curOpcode) { - /* TODO: Think of a good name for 0x80000000 and replace it with a constant */ - while (*pToken & 0x80000000) { - /* unknown current opcode ... */ - FIXME("unrecognized opcode: %08lx", *pToken); - ++pToken; - ++len; - TRACE("\n"); - } + int tokens_read; + + FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); + tokens_read = shader_skip_unrecognized((IWineD3DBaseShader*) This, pToken); + pToken += tokens_read; + len += tokens_read; } else { if (curOpcode->opcode == D3DSIO_DCL) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aa875e6..34d512e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1372,6 +1372,16 @@ extern void shader_dump_param( const DWORD param, int input); +extern int shader_get_param( + IWineD3DBaseShader* iface, + const DWORD* pToken, + DWORD* param, + DWORD* addr_token); + +extern int shader_skip_unrecognized( + IWineD3DBaseShader* iface, + const DWORD* pToken); + inline static int shader_get_regtype(const DWORD param) { return (((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2));

1 0

Ivan Gyurdiev : wined3d: Do not rely on num_params to skip unhandled tokens in shaders 2.0.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 53d240a3e0452c66a43d57ba8fa28fbcc5fbb64e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53d240a3e0452c66a43d57b… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 02:00:47 2006 -0400 wined3d: Do not rely on num_params to skip unhandled tokens in shaders 2.0. --- dlls/wined3d/baseshader.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 79a47e6..6ea5e9d 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -85,6 +85,20 @@ const SHADER_OPCODE* shader_get_opcode( return NULL; } +/* Return the number of parameters to skip for an opcode */ +static inline int shader_skip_opcode( + IWineD3DBaseShaderImpl* This, + const SHADER_OPCODE* curOpcode, + DWORD opcode_token) { + + /* Shaders >= 2.0 may contain address tokens, but fortunately they + * have a useful legnth mask - use it here. Shaders 1.0 contain no such tokens */ + + return (D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2)? + ((opcode_token & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT): + curOpcode->num_params; +} + /* Note: For vertex shaders, * texUsed = addrUsed, and * D3DSPR_TEXTURE = D3DSPR_ADDR. @@ -424,6 +438,7 @@ void generate_base_shader( IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; const DWORD *pToken = pFunction; const SHADER_OPCODE *curOpcode = NULL; + DWORD opcode_token; DWORD i; /* Initialize current parsing state */ @@ -465,8 +480,8 @@ void generate_base_shader( } /* Read opcode */ - curOpcode = shader_get_opcode(iface, *pToken); - ++pToken; + opcode_token = *pToken++; + curOpcode = shader_get_opcode(iface, opcode_token); /* Unknown opcode and its parameters */ if (NULL == curOpcode) { @@ -479,14 +494,14 @@ void generate_base_shader( } else if (USING_GLSL && curOpcode->hw_glsl_fct == NULL) { FIXME("Token %s is not yet implemented with GLSL\n", curOpcode->name); - pToken += curOpcode->num_params; + pToken += shader_skip_opcode(This, curOpcode, opcode_token); /* Unhandled opcode in ARB */ } else if ( !USING_GLSL && GLNAME_REQUIRE_GLSL == curOpcode->glname) { FIXME("Token %s requires greater functionality than " "Vertex or Fragment_Program_ARB supports\n", curOpcode->name); - pToken += curOpcode->num_params; + pToken += shader_skip_opcode(This, curOpcode, opcode_token); /* If a generator function is set for current shader target, use it */ } else if ((!USING_GLSL && curOpcode->hw_fct != NULL) || @@ -515,13 +530,10 @@ void generate_base_shader( } else { - TRACE("Found opcode D3D:%s GL:%s, PARAMS:%d,\n", - curOpcode->name, curOpcode->glname, curOpcode->num_params); - /* Unless we encounter a no-op command, this opcode is unrecognized */ if (curOpcode->opcode != D3DSIO_NOP) { FIXME("Can't handle opcode %s in hwShader\n", curOpcode->name); - pToken += curOpcode->num_params; + pToken += shader_skip_opcode(This, curOpcode, opcode_token); } } }

1 0

Ivan Gyurdiev : wined3d: Allow multiple output modifiers.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: d4dd9869b875f582285148173db12b5ec9d36cfe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4dd9869b875f5822851481… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 01:58:19 2006 -0400 wined3d: Allow multiple output modifiers. --- dlls/wined3d/baseshader.c | 14 +++++++------- dlls/wined3d/pixelshader.c | 28 +++++++++++++++++----------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 92db8ab..79a47e6 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -547,13 +547,13 @@ void shader_dump_ins_modifiers(const DWO default: TRACE("_unhandled_shift(%ld)", shift); break; } - switch(mmask) { - case D3DSPDM_NONE: break; - case D3DSPDM_SATURATE: TRACE("_sat"); break; - case D3DSPDM_PARTIALPRECISION: TRACE("_pp"); break; - case D3DSPDM_MSAMPCENTROID: TRACE("_centroid"); break; - default: TRACE("_unhandled_modifier(%#lx)", mmask); break; - } + if (mmask & D3DSPDM_SATURATE) TRACE("_sat"); + if (mmask & D3DSPDM_PARTIALPRECISION) TRACE("_pp"); + if (mmask & D3DSPDM_MSAMPCENTROID) TRACE("_centroid"); + + mmask &= ~(D3DSPDM_SATURATE | D3DSPDM_PARTIALPRECISION | D3DSPDM_MSAMPCENTROID); + if (mmask) + FIXME("_unrecognized_modifier(%#lx)", mmask >> D3DSP_DSTMOD_SHIFT); } /* TODO: Move other shared code here */ diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index ace0c2d..99c1fc9 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -981,9 +981,13 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG unsigned int i; char tmpLine[256]; + + /* Output token related */ char output_rname[256]; char output_wmask[20]; BOOL saturate = FALSE; + BOOL centroid = FALSE; + BOOL partialprecision = FALSE; DWORD shift; TRACE("Appending glname %s to tmpLine\n", curOpcode->glname); @@ -992,17 +996,19 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG /* Process modifiers */ if (0 != (dst & D3DSP_DSTMOD_MASK)) { DWORD mask = dst & D3DSP_DSTMOD_MASK; - switch (mask) { - case D3DSPDM_SATURATE: saturate = TRUE; break; -#if 0 /* as yet unhandled modifiers */ - case D3DSPDM_CENTROID: centroid = TRUE; break; - case D3DSPDM_PP: partialpresision = TRUE; break; -#endif - default: - TRACE("_unhandled_modifier(0x%08lx)\n", mask); - } - } - shift = (dst & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT; + + saturate = mask & D3DSPDM_SATURATE; + centroid = mask & D3DSPDM_MSAMPCENTROID; + partialprecision = mask & D3DSPDM_PARTIALPRECISION; + mask &= ~(D3DSPDM_MSAMPCENTROID | D3DSPDM_PARTIALPRECISION | D3DSPDM_SATURATE); + + if (mask) + FIXME("Unrecognized modifier(0x%#lx)\n", mask >> D3DSP_DSTMOD_SHIFT); + + if (centroid) + FIXME("Unhandled modifier(0x%#lx)\n", mask >> D3DSP_DSTMOD_SHIFT); + } + shift = (dst & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT; /* Generate input and output registers */ if (curOpcode->num_params > 0) {

1 0

Ivan Gyurdiev : wined3d: Fix SINCOS parameters.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: c94ecdff6122e1e300fe5c74bd3958612625f079 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c94ecdff6122e1e300fe5c7… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 01:57:06 2006 -0400 wined3d: Fix SINCOS parameters. SINCOS has 4 parameters in shaders 2.0. It has 2 parameters in shaders 3.0. It's undefined in shaders 1.0. --- dlls/wined3d/pixelshader.c | 9 +++++++-- dlls/wined3d/vertexshader.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 4a5e326..ace0c2d 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -533,10 +533,14 @@ void pshader_nrm(WINED3DSHADERVECTOR* d, FIXME(" : Stub\n"); } -void pshader_sincos(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) { +void pshader_sincos3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) { FIXME(" : Stub\n"); } +void pshader_sincos2(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2) { + FIXME(" : Stub\n"); +} + void pshader_rep(WINED3DSHADERVECTOR* d) { FIXME(" : Stub\n"); } @@ -667,7 +671,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI */ {D3DSIO_NRM, "nrm", NULL, 2, pshader_nrm, NULL, NULL, 0, 0}, - {D3DSIO_SINCOS, "sincos", NULL, 2, pshader_sincos, NULL, NULL, 0, 0}, + {D3DSIO_SINCOS, "sincos", NULL, 4, pshader_sincos2, NULL, NULL, D3DPS_VERSION(2,0), D3DPS_VERSION(2,0)}, + {D3DSIO_SINCOS, "sincos", NULL, 2, pshader_sincos3, NULL, NULL, D3DPS_VERSION(3,0), -1}, /* TODO: dp2add can be made out of multiple instuctions */ {D3DSIO_DP2ADD, "dp2add", GLNAME_REQUIRE_GLSL, 2, pshader_dp2add, NULL, NULL, 0, 0}, diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 9475412..4c8eb14 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -404,10 +404,14 @@ void vshader_nrm(WINED3DSHADERVECTOR* d, FIXME(" : Stub\n"); } -void vshader_sincos(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) { +void vshader_sincos3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) { FIXME(" : Stub\n"); } +void vshader_sincos2(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2) { + FIXME(" : Stub\n"); +} + void vshader_rep(WINED3DSHADERVECTOR* d) { FIXME(" : Stub\n"); } @@ -524,7 +528,8 @@ CONST SHADER_OPCODE IWineD3DVertexShader */ {D3DSIO_NRM, "nrm", NULL, 2, vshader_nrm, NULL, NULL, 0, 0}, - {D3DSIO_SINCOS, "sincos", NULL, 2, vshader_sincos, NULL, NULL, 0, 0}, + {D3DSIO_SINCOS, "sincos", NULL, 4, vshader_sincos2, NULL, NULL, D3DVS_VERSION(2,0), D3DVS_VERSION(2,0)}, + {D3DSIO_SINCOS, "sincos", NULL, 2, vshader_sincos3, NULL, NULL, D3DVS_VERSION(3,0), -1}, /* Matrix */ {D3DSIO_M4x4, "m4x4", "undefined", 3, vshader_m4x4, vshader_hw_mnxn, NULL, 0, 0},

1 0

Ivan Gyurdiev : wined3d: DEFI takes 5 parameters.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 6b5d07639485d6c2d869c1f84ca69756c84f9cc0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b5d07639485d6c2d869c1f… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 17 01:55:32 2006 -0400 wined3d: DEFI takes 5 parameters. According the spec and the Painkiller log, DEFI has 5 parameters on vertex shaders. --- dlls/wined3d/vertexshader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 7325032..9475412 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -456,7 +456,7 @@ void vshader_defb(WINED3DSHADERVECTOR* d FIXME(" : Stub\n"); } -void vshader_defi(WINED3DSHADERVECTOR* d) { +void vshader_defi(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2, WINED3DSHADERVECTOR* s3) { FIXME(" : Stub\n"); } @@ -539,7 +539,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader /* Constant definitions */ {D3DSIO_DEF, "def", NULL, 5, vshader_def, vshader_hw_def, NULL, 0, 0}, {D3DSIO_DEFB, "defb", GLNAME_REQUIRE_GLSL, 2, vshader_defb, NULL, NULL, 0, 0}, - {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 2, vshader_defi, NULL, NULL, 0, 0}, + {D3DSIO_DEFI, "defi", GLNAME_REQUIRE_GLSL, 5, vshader_defi, NULL, NULL, 0, 0}, /* Flow control - requires GLSL or software shaders */ {D3DSIO_REP , "rep", GLNAME_REQUIRE_GLSL, 1, vshader_rep, NULL, NULL, 0, 0},

1 0

Paul Vriens : ntdll/tests: Don't fail if a process is not available.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: c2a2687dd89cf72059fab0944f4497818056a939 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c2a2687dd89cf72059fab09… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue May 16 21:19:40 2006 +0200 ntdll/tests: Don't fail if a process is not available. --- dlls/ntdll/tests/info.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e5bb9b4..12c6fb3 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -729,7 +729,15 @@ static void test_query_process_handlecou ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status); process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, one_before_last_pid); - trace("Handlecount for process with ID : %ld\n", one_before_last_pid); + if (!process) + { + trace("Could not open process with ID : %ld, error : %08lx. Going to use current one.\n", one_before_last_pid, GetLastError()); + process = GetCurrentProcess(); + trace("ProcessHandleCount for current process\n"); + } + else + trace("ProcessHandleCount for process with ID : %ld\n", one_before_last_pid); + status = pNtQueryInformationProcess( process, ProcessHandleCount, &handlecount, sizeof(handlecount), &ReturnLength); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); ok( sizeof(handlecount) == ReturnLength, "Inconsistent length (%d) <-> (%ld)\n", sizeof(handlecount), ReturnLength);

1 0

Dmitry Timoshkov : user32: Make all the recently added ShowWindow tests pass in Wine.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: f839a179a2136984fda1ec704b57befdd7dbd563 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f839a179a2136984fda1ec7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 17 16:35:26 2006 +0900 user32: Make all the recently added ShowWindow tests pass in Wine. --- dlls/user/tests/msg.c | 39 +++++++++++++++++++++++++++----------- dlls/x11drv/winpos.c | 50 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 66 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f839a179a2136984fda…

1 0

Eric Pouech : usp10: Fix ScriptGetProperties so that first pointer can be NULL.
by Alexandre Julliard May 17, 2006

May 17, 2006

Module: wine Branch: refs/heads/master Commit: 766530dfe8e7bec6ba73aab8e380b6cf3557a48c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=766530dfe8e7bec6ba73aab… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue May 16 21:12:16 2006 +0200 usp10: Fix ScriptGetProperties so that first pointer can be NULL. --- dlls/usp10/usp10.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8fbad37..4b54959 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -109,13 +109,16 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CA */ HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts) { - TRACE("%p,%p\n",ppSp, piNumScripts); + TRACE("%p,%p\n", ppSp, piNumScripts); -/* Set up a sensible default and intialise pointers */ - *piNumScripts = MAX_SCRIPTS; - *ppSp = Global_Script; - TRACE("ppSp:%p, *ppSp:%p, **ppSp:%p, %d\n", ppSp, *ppSp, **ppSp, - *piNumScripts); + if (!ppSp && !piNumScripts) return E_INVALIDARG; + + /* Set up a sensible default and intialise pointers */ + if (piNumScripts) *piNumScripts = MAX_SCRIPTS; + if (ppSp) *ppSp = Global_Script; + TRACE("ppSp:%p, *ppSp:%p, **ppSp:%p, %d\n", + ppSp, ppSp ? *ppSp : NULL, (ppSp && *ppSp) ? **ppSp : NULL, + piNumScripts ? *piNumScripts : -1); return 0; }

1 0