May 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use the shader_sm1_read_*() functions in shader_trace_init().
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 59705b9c2099327990f6472b5410e41508e32037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59705b9c2099327990f6472b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:54 2009 +0200 wined3d: Use the shader_sm1_read_*() functions in shader_trace_init(). --- dlls/wined3d/baseshader.c | 49 +++++++++++++------------------------------- 1 files changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index cc7bf88..7efed39 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1304,19 +1304,22 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table } else { - DWORD param, addr_token = 0; - int tokens_read; + struct wined3d_shader_src_param dst_rel_addr, src_rel_addr; + struct wined3d_shader_dst_param dst_param; + struct wined3d_shader_src_param src_param; + + if (ins.dst_count) + { + shader_sm1_read_dst_param(&pToken, &dst_param, &dst_rel_addr, shader_version); + } /* Print out predication source token first - it follows * the destination token. */ if (ins.predicate) { - struct wined3d_shader_src_param pred; - - shader_parse_src_param(*(pToken + 2), NULL, &pred); - + shader_sm1_read_src_param(&pToken, &src_param, &src_rel_addr, shader_version); TRACE("("); - shader_dump_src_param(&pred, shader_version); + shader_dump_src_param(&src_param, shader_version); TRACE(") "); } @@ -1346,42 +1349,20 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table TRACE("p"); } - /* Destination token */ + /* We already read the destination token, print it. */ if (ins.dst_count) { - struct wined3d_shader_dst_param dst; - struct wined3d_shader_src_param rel_addr; - - shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); - - shader_dump_ins_modifiers(&dst); + shader_dump_ins_modifiers(&dst_param); TRACE(" "); - shader_dump_dst_param(&dst, shader_version); + shader_dump_dst_param(&dst_param, shader_version); } - /* Predication token - already printed out, just skip it */ - if (ins.predicate) ++pToken; - /* Other source tokens */ for (i = ins.dst_count; i < (ins.dst_count + ins.src_count); ++i) { - struct wined3d_shader_src_param src, rel_addr; - - tokens_read = shader_get_param(pToken, shader_version, &param, &addr_token); - pToken += tokens_read; - - if (param & WINED3DSHADER_ADDRMODE_RELATIVE) - { - shader_parse_src_param(addr_token, NULL, &rel_addr); - shader_parse_src_param(param, &rel_addr, &src); - } - else - { - shader_parse_src_param(param, NULL, &src); - } - + shader_sm1_read_src_param(&pToken, &src_param, &src_rel_addr, shader_version); TRACE(!i ? " " : ", "); - shader_dump_src_param(&src, shader_version); + shader_dump_src_param(&src_param, shader_version); } } TRACE("\n");

1 0

Henri Verbeet : wined3d: Merge wined3d_private_types.h into wined3d_private .h.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 7420a96736b5328b83890bfbc387612cc7649efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7420a96736b5328b83890bfbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:54 2009 +0200 wined3d: Merge wined3d_private_types.h into wined3d_private.h. --- dlls/wined3d/wined3d_private.h | 212 ++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private_types.h | 228 ---------------------------------- 2 files changed, 201 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7420a96736b5328b83890…

1 0

Henri Verbeet : wined3d: Introduce shader_sm1_read_comment() to read shader comments.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: a605fcd2fd54358a3615b071229935f224f69c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a605fcd2fd54358a3615b0712… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:54 2009 +0200 wined3d: Introduce shader_sm1_read_comment() to read shader comments. --- dlls/wined3d/baseshader.c | 48 +++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7efed39..c56b3cf 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -296,6 +296,20 @@ static void shader_sm1_read_semantic(const DWORD **ptr, struct wined3d_shader_se shader_parse_dst_param(dst_token, NULL, &semantic->reg); } +static void shader_sm1_read_comment(const DWORD **ptr, const char **comment) +{ + DWORD token = **ptr; + + if ((token & WINED3DSI_OPCODE_MASK) != WINED3DSIO_COMMENT) + { + *comment = NULL; + return; + } + + *comment = (const char *)++(*ptr); + *ptr += (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; +} + static const char *shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", @@ -465,11 +479,6 @@ static inline DWORD shader_get_writemask(DWORD param) return param & WINED3DSP_WRITEMASK_ALL; } -static inline BOOL shader_is_comment(DWORD token) -{ - return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); -} - /* Convert floating point offset relative * to a register file to an absolute offset for float constants */ static unsigned int shader_get_float_offset(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) @@ -608,16 +617,12 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m while (WINED3DVS_END() != *pToken) { struct wined3d_shader_instruction ins; + const char *comment; UINT param_size; /* Skip comments */ - if (shader_is_comment(*pToken)) - { - DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; - ++pToken; - pToken += comment_len; - continue; - } + shader_sm1_read_comment(&pToken, &comment); + if (comment) continue; /* Fetch opcode */ shader_sm1_read_opcode(&pToken, &ins, &param_size, shader_ins, shader_version); @@ -1132,15 +1137,12 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, while (WINED3DPS_END() != *pToken) { + const char *comment; UINT param_size; /* Skip comment tokens */ - if (shader_is_comment(*pToken)) - { - pToken += (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; - ++pToken; - continue; - } + shader_sm1_read_comment(&pToken, &comment); + if (comment) continue; /* Read opcode */ shader_sm1_read_opcode(&pToken, &ins, &param_size, opcode_table, shader_version); @@ -1245,14 +1247,14 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table while (WINED3DVS_END() != *pToken) { struct wined3d_shader_instruction ins; + const char *comment; UINT param_size; - if (shader_is_comment(*pToken)) /* comment */ + /* comment */ + shader_sm1_read_comment(&pToken, &comment); + if (comment) { - DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; - ++pToken; - TRACE("//%s\n", (const char*)pToken); - pToken += comment_len; + TRACE("//%s\n", comment); continue; }

1 0