June 2009 - Wine-Commits - list.winehq.org

Austin English : wine.inf: Add placeholder exe for wordpad.exe.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: 2deeb1c736fecf3a223e9fb3c9203957f82f52ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2deeb1c736fecf3a223e9fb3c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 16 18:52:47 2009 -0500 wine.inf: Add placeholder exe for wordpad.exe. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 2ec05a5..4d2999e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2519,6 +2519,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,winspool.drv 11,,wintab32.dll 11,,winver.exe +11,,wordpad.exe 11,,ws2_32.dll 11,,wsock32.dll 12,,mountmgr.sys

1 0

Stefan Doesinger : wined3d: Add modifier support to tex and friends.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: dfd338de775afff77b09209031a25e18a21e8b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd338de775afff77b0920903… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Thu May 28 19:31:08 2009 +0200 wined3d: Add modifier support to tex and friends. --- dlls/wined3d/arb_program_shader.c | 68 ++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e081774..b39732d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -910,6 +910,35 @@ static void gen_color_correction(SHADER_BUFFER *buffer, const char *reg, DWORD d } } +static const char *shader_arb_get_modifier(const struct wined3d_shader_instruction *ins) +{ + DWORD mod; + const char *ret = ""; + if (!ins->dst_count) return ""; + + mod = ins->dst[0].modifiers; + if(mod & WINED3DSPDM_SATURATE) + { + ret = "_SAT"; + mod &= ~WINED3DSPDM_SATURATE; + } + if(mod & WINED3DSPDM_PARTIALPRECISION) + { + FIXME("Unhandled modifier WINED3DSPDM_PARTIALPRECISION\n"); + mod &= ~WINED3DSPDM_PARTIALPRECISION; + } + if(mod & WINED3DSPDM_MSAMPCENTROID) + { + FIXME("Unhandled modifier WINED3DSPDM_MSAMPCENTROID\n"); + mod &= ~WINED3DSPDM_MSAMPCENTROID; + } + if(mod) + { + FIXME("Unknown modifiers 0x%08x\n", mod); + } + return ret; +} + #define TEX_PROJ 0x1 #define TEX_BIAS 0x2 #define TEX_LOD 0x4 @@ -924,6 +953,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + const char *mod = shader_arb_get_modifier(ins); switch(sampler_type) { case WINED3DSTT_1D: @@ -963,29 +993,30 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD { if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivates\n"); if(flags & TEX_BIAS) FIXME("Biased texture sampling with custom derivates\n"); - shader_addline(buffer, "TXD %s, %s, %s, %s, texture[%u], %s;\n", dst_str, coord_reg, dsx, dsy, - sampler_idx, tex_type); + shader_addline(buffer, "TXD%s %s, %s, %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, + dsx, dsy,sampler_idx, tex_type); } else if(flags & TEX_LOD) { if(flags & TEX_PROJ) FIXME("Projected texture sampling with explicit lod\n"); if(flags & TEX_BIAS) FIXME("Biased texture sampling with explicit lod\n"); - shader_addline(buffer, "TXL %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TXL%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, + sampler_idx, tex_type); } else if (flags & TEX_BIAS) { /* Shouldn't be possible, but let's check for it */ if(flags & TEX_PROJ) FIXME("Biased and Projected texture sampling\n"); /* TXB takes the 4th component of the source vector automatically, as d3d. Nothing more to do */ - shader_addline(buffer, "TXB %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TXB%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); } else if (flags & TEX_PROJ) { - shader_addline(buffer, "TXP %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TXP%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); } else { - shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) @@ -1079,31 +1110,6 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in sprintf(outregstr, "T%c%s", 'A' + tmpreg, swzstr); } -static const char *shader_arb_get_modifier(const struct wined3d_shader_instruction *ins) -{ - DWORD mod; - const char *ret = ""; - if (!ins->dst_count) return ""; - - mod = ins->dst[0].modifiers; - if(mod & WINED3DSPDM_SATURATE) { - ret = "_SAT"; - mod &= ~WINED3DSPDM_SATURATE; - } - if(mod & WINED3DSPDM_PARTIALPRECISION) { - FIXME("Unhandled modifier WINED3DSPDM_PARTIALPRECISION\n"); - mod &= ~WINED3DSPDM_PARTIALPRECISION; - } - if(mod & WINED3DSPDM_MSAMPCENTROID) { - FIXME("Unhandled modifier WINED3DSPDM_MSAMPCENTROID\n"); - mod &= ~WINED3DSPDM_MSAMPCENTROID; - } - if(mod) { - FIXME("Unknown modifiers 0x%08x\n", mod); - } - return ret; -} - static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_dst_param *dst = &ins->dst[0];

1 0

Stefan Doesinger : wined3d: Implement D3DSPDM_PARTIALPRECISION support.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: a7b605af6497765c9b9e3e5d24312dfc89f79b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b605af6497765c9b9e3e5d2… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Thu May 28 19:42:24 2009 +0200 wined3d: Implement D3DSPDM_PARTIALPRECISION support. --- dlls/wined3d/arb_program_shader.c | 44 ++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b39732d..80bb563 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -913,30 +913,38 @@ static void gen_color_correction(SHADER_BUFFER *buffer, const char *reg, DWORD d static const char *shader_arb_get_modifier(const struct wined3d_shader_instruction *ins) { DWORD mod; - const char *ret = ""; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; if (!ins->dst_count) return ""; mod = ins->dst[0].modifiers; - if(mod & WINED3DSPDM_SATURATE) - { - ret = "_SAT"; - mod &= ~WINED3DSPDM_SATURATE; - } - if(mod & WINED3DSPDM_PARTIALPRECISION) - { - FIXME("Unhandled modifier WINED3DSPDM_PARTIALPRECISION\n"); - mod &= ~WINED3DSPDM_PARTIALPRECISION; - } + + /* Silently ignore PARTIALPRECISION if its not supported */ + if(priv->target_version == ARB) mod &= ~WINED3DSPDM_PARTIALPRECISION; + if(mod & WINED3DSPDM_MSAMPCENTROID) { FIXME("Unhandled modifier WINED3DSPDM_MSAMPCENTROID\n"); mod &= ~WINED3DSPDM_MSAMPCENTROID; } - if(mod) + + switch(mod) { - FIXME("Unknown modifiers 0x%08x\n", mod); + case WINED3DSPDM_SATURATE | WINED3DSPDM_PARTIALPRECISION: + return "H_SAT"; + + case WINED3DSPDM_SATURATE: + return "_SAT"; + + case WINED3DSPDM_PARTIALPRECISION: + return "H"; + + case 0: + return ""; + + default: + FIXME("Unknown modifiers 0x%08x\n", mod); + return ""; } - return ret; } #define TEX_PROJ 0x1 @@ -953,7 +961,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; - const char *mod = shader_arb_get_modifier(ins); + const char *mod; switch(sampler_type) { case WINED3DSTT_1D: @@ -989,6 +997,12 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD tex_type = ""; } + /* TEX, TXL, TXD and TXP do not support the "H" modifier, + * so don't use shader_arb_get_modifier + */ + if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) mod = "_SAT"; + else mod = ""; + if (flags & TEX_DERIV) { if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivates\n");

1 0

Stefan Doesinger : wined3d: Deal with instructions that do not support _SAT .
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: c9ef1ed28c861bc862c92ff68aa37b4ddf01cc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ef1ed28c861bc862c92ff68… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Tue Jun 16 17:20:12 2009 +0200 wined3d: Deal with instructions that do not support _SAT. --- dlls/wined3d/arb_program_shader.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 80bb563..729e6ce 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1158,6 +1158,7 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) char src_name[3][50]; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); + BOOL is_color; shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); @@ -1170,8 +1171,15 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); shader_addline(buffer, "ADD TA, -%s, coefdiv.x;\n", src_name[0]); - shader_addline(buffer, "CMP%s %s, TA, %s, %s;\n", - shader_arb_get_modifier(ins), dst_name, src_name[1], src_name[2]); + /* No modifiers supported on CMP */ + shader_addline(buffer, "CMP %s, TA, %s, %s;\n", dst_name, src_name[1], src_name[2]); + + /* _SAT on CMP doesn't make much sense, but it is not a pure NOP */ + if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) + { + shader_arb_get_register_name(ins, &dst->reg, src_name[0], &is_color); + shader_addline(buffer, "MOV_SAT %s, %s;\n", dst_name, dst_name); + } } } @@ -1181,6 +1189,7 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[3][50]; + BOOL is_color; shader_arb_get_dst_param(ins, dst, dst_name); @@ -1189,8 +1198,15 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); - shader_addline(buffer, "CMP%s %s, %s, %s, %s;\n", shader_arb_get_modifier(ins), dst_name, + /* No modifiers are supported on CMP */ + shader_addline(buffer, "CMP %s, %s, %s, %s;\n", dst_name, src_name[0], src_name[2], src_name[1]); + + if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) + { + shader_arb_get_register_name(ins, &dst->reg, src_name[0], &is_color); + shader_addline(buffer, "MOV_SAT %s, %s;\n", dst_name, src_name[0]); + } } /** Process the WINED3DSIO_DP2ADD instruction in ARB. @@ -2038,8 +2054,14 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src_name0); if(shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); - shader_addline(buffer, "SCS%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, - src_name0); + /* No modifiers are supported on SCS */ + shader_addline(buffer, "SCS %s, %s;\n", dst_name, src_name0); + + if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) + { + shader_arb_get_register_name(ins, &dst->reg, src_name0, &is_color); + shader_addline(buffer, "MOV_SAT %s, %s;\n", dst_name, src_name0); + } } else if(priv->target_version >= NV2) { shader_arb_get_register_name(ins, &dst->reg, dst_name, &is_color);

1 0

Stefan Doesinger : wined3d: Fix texm3x3pad.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: 7856c1c26f1882d423dd0531133bb62f84382b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7856c1c26f1882d423dd05311… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Thu May 28 18:41:50 2009 +0200 wined3d: Fix texm3x3pad. The register number is already in the name we got from get_register_name, don't add it twice. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c928174..e081774 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1653,8 +1653,8 @@ static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) shader_arb_get_register_name(ins, &tmp_reg, dst_name, &is_color); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 %s%u.%c, fragment.texcoord[%u], %s;\n", - dst_name, tmp_reg.idx, 'x' + current_state->current_row, reg, src0_name); + shader_addline(buffer, "DP3 %s.%c, fragment.texcoord[%u], %s;\n", + dst_name, 'x' + current_state->current_row, reg, src0_name); current_state->texcoord_w[current_state->current_row++] = reg; }

1 0

Stefan Doesinger : wined3d: Implement vpos and vface.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: 58c3a0c832cc15120e268bc33bb24ead0e703d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c3a0c832cc15120e268bc33… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Wed Jun 17 07:39:09 2009 +0200 wined3d: Implement vpos and vface. --- dlls/wined3d/arb_program_shader.c | 29 ++++++++++++++++++++++++++++- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1a9781e..c928174 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -806,6 +806,21 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction sprintf(register_name, "I%u", reg->idx); break; + case WINED3DSPR_MISCTYPE: + if(reg->idx == 0) + { + sprintf(register_name, "vpos"); + } + else if(reg->idx == 1) + { + sprintf(register_name, "fragment.facing.x"); + } + else + { + FIXME("Unknown MISCTYPE register index %u\n", reg->idx); + } + break; + default: FIXME("Unhandled register type %#x[%u]\n", reg->type, reg->idx); sprintf(register_name, "unrecognized_register[%u]", reg->idx); @@ -2626,7 +2641,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, * So enable the best we can get. */ if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0 || reg_maps->usestexldd || - reg_maps->usestexldl) + reg_maps->usestexldl || reg_maps->usesfacing) { want_nv_prog = TRUE; } @@ -2760,6 +2775,18 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, { compiled->ycorrection = next_local; shader_addline(buffer, "PARAM ycorrection = program.local[%u];\n", next_local++); + + if(reg_maps->vpos) + { + shader_addline(buffer, "TEMP vpos;\n"); + /* ycorrection.x: Backbuffer height(onscreen) or 0(offscreen). + * ycorrection.y: -1.0(onscreen), 1.0(offscreen) + * ycorrection.z: 1.0 + * ycorrection.w: 0.0 + */ + shader_addline(buffer, "MAD vpos, fragment.position, ycorrection.zyww, ycorrection.wxww;\n"); + shader_addline(buffer, "FLR vpos.xy, vpos;\n"); + } } else { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0d253a4..d1c8a4b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -287,6 +287,7 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh case WINED3DSPR_MISCTYPE: if (pshader && reg->idx == 0) reg_maps->vpos = 1; + if (pshader && reg->idx == 1) reg_maps->usesfacing = 1; break; case WINED3DSPR_CONST: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b7aa84d..aab56cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -629,7 +629,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova, usestexldl; + char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova, usestexldl, usesfacing; char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */

1 0

Stefan Doesinger : d3d9: Accept an alternative oFog->ps_3_0 handling.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: f75dadfeb71f1bb7254e38810aec21d87b4b57e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75dadfeb71f1bb7254e38810… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Thu May 28 16:33:36 2009 +0200 d3d9: Accept an alternative oFog->ps_3_0 handling. --- dlls/d3d9/tests/visual.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 07a3531..fff1f88 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5594,12 +5594,25 @@ static void vshader_version_varying_test(IDirect3DDevice9 *device) { color = getPixelColor(device, 160, 120); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x1a, 0x34, 0x67), 1), "vs_3_0 returned color 0x%08x, expected 0x00193366\n", color); + /* Accept two ways of oFog handling: + * + * oFog is supposed to be a scalar. The pixel shader declares a vec4 oFog input and reads all components. + * The vertex shader writes oFog without a writemask. There are two ways windows drivers deal with this: + * + * 1) Keep oFog a scalar, and assign v4 = {oFog, 0, 0, 0}. oFog = 0x33, so the result color is 004d0067. + * This happens with software vertex processing and on Intel cards + * + * 2) Make oFog a vec4, and assign v4 = {oFog.x, oFog.y, oFog.z, oFog.w}. This way the result color is + * 0x004d339a. This happens on Nvidia Geforce 6+ cards + */ color = getPixelColor(device, 160, 360); - ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x4d, 0x00, 0x67), 1), + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x4d, 0x00, 0x67), 1) || + color_match(color, D3DCOLOR_ARGB(0x00, 0x4d, 0x33, 0x9a), 1), "vs_1_1 returned color 0x%08x, expected 0x004c0066\n", color); color = getPixelColor(device, 480, 360); - ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x4d, 0x00, 0x67), 1), - "vs_2_0 returned color 0x%08x, expected 0x004c0066\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x4d, 0x00, 0x67), 1) || + color_match(color, D3DCOLOR_ARGB(0x00, 0x4d, 0x33, 0x9a), 1), + "vs_2_0 returned color 0x%08x, expected 0x004d0067 or 0x004d33a0\n", color); /* cleanup */ hr = IDirect3DDevice9_SetPixelShader(device, NULL);

1 0

Stefan Doesinger : wined3d: Use bitfields for reg_maps uses* members.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: cd348ac897dd640e8d4c34f08a47859afa9e532c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd348ac897dd640e8d4c34f08… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Fri May 29 17:29:57 2009 +0200 wined3d: Use bitfields for reg_maps uses* members. --- dlls/wined3d/wined3d_private.h | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aab56cd..b7c5592 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -629,15 +629,22 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova, usestexldl, usesfacing; - char usesrelconstF; + + unsigned usesnrm : 1; + unsigned vpos : 1; + unsigned usesdsx : 1; + unsigned usesdsy : 1; + unsigned usestexldd : 1; + unsigned usesmova : 1; + unsigned usesfacing : 1; + unsigned usesrelconstF : 1; + unsigned fog : 1; + unsigned usestexldl : 1; + unsigned padding : 6; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; - /* Whether or not this shader uses fog */ - char fog; - } shader_reg_maps; struct wined3d_shader_context

1 0

Henri Verbeet : wined3d: Avoid some unneeded depthstencil copies.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: 8be020776b51e08172cce0c43689f884dc0dde7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be020776b51e08172cce0c43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 10:19:52 2009 +0200 wined3d: Avoid some unneeded depthstencil copies. --- dlls/wined3d/drawprim.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c92659f..acbfbf9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -574,10 +574,16 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT numberOfVertice if (This->stencilBufferTarget) { /* Note that this depends on the ActivateContext call above to set - * This->render_offscreen properly */ + * This->render_offscreen properly. We don't currently take the + * Z-compare function into account, but we could skip loading the + * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note + * that we never copy the stencil data.*/ DWORD location = This->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - surface_load_ds_location(This->stencilBufferTarget, location); - surface_modify_ds_location(This->stencilBufferTarget, location); + if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE] + || This->stateBlock->renderState[WINED3DRS_ZENABLE]) + surface_load_ds_location(This->stencilBufferTarget, location); + if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) + surface_modify_ds_location(This->stencilBufferTarget, location); } /* Ok, we will be updating the screen from here onwards so grab the lock */

1 0

Stefan Doesinger : wined3d: Implement texldl in ARB.
by Alexandre Julliard June 17, 2009

June 17, 2009

Module: wine Branch: master Commit: ae600fe0c87c41d9a4d0f58686ec4383f2fb204d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae600fe0c87c41d9a4d0f5868… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Fri May 29 17:24:55 2009 +0200 wined3d: Implement texldl in ARB. --- dlls/wined3d/arb_program_shader.c | 33 ++++++++++++++++++++++++++++++--- dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3bb603b..1a9781e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -951,6 +951,12 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD shader_addline(buffer, "TXD %s, %s, %s, %s, texture[%u], %s;\n", dst_str, coord_reg, dsx, dsy, sampler_idx, tex_type); } + else if(flags & TEX_LOD) + { + if(flags & TEX_PROJ) FIXME("Projected texture sampling with explicit lod\n"); + if(flags & TEX_BIAS) FIXME("Biased texture sampling with explicit lod\n"); + shader_addline(buffer, "TXL %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + } else if (flags & TEX_BIAS) { /* Shouldn't be possible, but let's check for it */ @@ -2399,6 +2405,22 @@ static void shader_hw_texldd(const struct wined3d_shader_instruction *ins) shader_hw_sample(ins, sampler_idx, reg_dest, reg_src[0], flags, reg_src[1], reg_src[2]); } +static void shader_hw_texldl(const struct wined3d_shader_instruction *ins) +{ + DWORD sampler_idx = ins->src[1].reg.idx; + char reg_dest[40]; + char reg_coord[40]; + DWORD flags = TEX_LOD; + + shader_arb_get_dst_param(ins, &ins->dst[0], reg_dest); + shader_arb_get_src_param(ins, &ins->src[0], 0, reg_coord); + + if (ins->flags & WINED3DSI_TEXLD_PROJECT) flags |= TEX_PROJ; + if (ins->flags & WINED3DSI_TEXLD_BIAS) flags |= TEX_BIAS; + + shader_hw_sample(ins, sampler_idx, reg_dest, reg_coord, flags, NULL, NULL); +} + static GLuint create_arb_blt_vertex_program(const WineD3D_GL_Info *gl_info) { GLuint program_id = 0; @@ -2603,7 +2625,8 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, * Testing shows no performance difference between OPTION NV_fragment_program2 and NV_fragment_program. * So enable the best we can get. */ - if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0 || reg_maps->usestexldd) + if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0 || reg_maps->usestexldd || + reg_maps->usestexldl) { want_nv_prog = TRUE; } @@ -2810,7 +2833,11 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* Always enable the NV extension if available. Unlike fragment shaders, there is no * mesurable performance penalty, and we can always make use of it for clipplanes. */ - if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) { + if(GL_SUPPORT(NV_VERTEX_PROGRAM3)) { + shader_addline(buffer, "OPTION NV_vertex_program3;\n"); + priv_ctx.target_version = NV3; + shader_addline(buffer, "ADDRESS aL;\n"); + } else if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) { shader_addline(buffer, "OPTION NV_vertex_program2;\n"); priv_ctx.target_version = NV2; shader_addline(buffer, "ADDRESS aL;\n"); @@ -3492,7 +3519,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXDP3TEX */ pshader_hw_texdp3tex, /* WINED3DSIH_TEXKILL */ pshader_hw_texkill, /* WINED3DSIH_TEXLDD */ shader_hw_texldd, - /* WINED3DSIH_TEXLDL */ NULL, + /* WINED3DSIH_TEXLDL */ shader_hw_texldl, /* WINED3DSIH_TEXM3x2DEPTH */ pshader_hw_texm3x2depth, /* WINED3DSIH_TEXM3x2PAD */ pshader_hw_texm3x2pad, /* WINED3DSIH_TEXM3x2TEX */ pshader_hw_texm3x2tex, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 49eee0b..0d253a4 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -692,6 +692,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usestexldd = 1; } + else if(ins.handler_idx == WINED3DSIH_TEXLDL) + { + reg_maps->usestexldl = 1; + } else if(ins.handler_idx == WINED3DSIH_MOVA) { reg_maps->usesmova = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e089e2..b7aa84d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -629,7 +629,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova; + char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova, usestexldl; char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */

1 0