wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Aric Stewart : shell32: Handle shell: urls internal in ParseDisplayName instead of passing them to shdocvw.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 92246095890d4e7fff2d6bcdf372c99772663660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92246095890d4e7fff2d6bcdf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 26 17:01:08 2009 +0900 shell32: Handle shell: urls internal in ParseDisplayName instead of passing them to shdocvw. --- dlls/shell32/shfldr_desktop.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index c9b7412..a08bb41 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -187,7 +187,19 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, } else if (strchrW(lpszDisplayName,':')) { - return IEParseDisplayNameWithBCW(CP_ACP,lpszDisplayName,pbc,ppidl); + PARSEDURLW urldata; + + urldata.cbSize = sizeof(urldata); + ParseURLW(lpszDisplayName,&urldata); + + if (urldata.nScheme == URL_SCHEME_SHELL) /* handle shell: urls */ + { + TRACE ("-- shell url: %s\n", debugstr_w(urldata.pszSuffix)); + SHCLSIDFromStringW (urldata.pszSuffix+2, &clsid); + pidlTemp = _ILCreateGuid (PT_GUID, &clsid); + } + else + return IEParseDisplayNameWithBCW(CP_ACP,lpszDisplayName,pbc,ppidl); } else {

1 0

Gerald Pfeifer : d3d9: Fix variable type in reset_enum_callback().
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: b44596ffff3302493eb6ba13ae52fc58bd3ea0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44596ffff3302493eb6ba13a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jun 25 21:56:00 2009 +0200 d3d9: Fix variable type in reset_enum_callback(). --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9d1c72e..14885de 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -424,7 +424,7 @@ static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9EX ifac static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data) { BOOL *resources_ok = data; - WINED3DRESOURCETYPE type; + D3DRESOURCETYPE type; HRESULT ret = S_OK; WINED3DSURFACE_DESC surface_desc; WINED3DVOLUME_DESC volume_desc;

1 0

Austin English : winecfg: Fix cd detection for FreeBSD.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 6b80c80410f92967fa922b10944ea0ceb1f1d455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b80c80410f92967fa922b109… Author: Austin English <austinenglish(a)bordeauxgroup.com> Date: Fri Jun 26 01:40:59 2009 -0500 winecfg: Fix cd detection for FreeBSD. --- programs/winecfg/drivedetect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 8e55f56..75bce53 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -56,8 +56,10 @@ typedef struct static const DEV_NODES sDeviceNodes[] = { {"/dev/fd", DRIVE_REMOVABLE}, {"/dev/pf", DRIVE_REMOVABLE}, + {"/dev/acd", DRIVE_CDROM}, {"/dev/aztcd", DRIVE_CDROM}, {"/dev/bpcd", DRIVE_CDROM}, + {"/dev/cd", DRIVE_CDROM}, {"/dev/cdrom", DRIVE_CDROM}, {"/dev/cdu535", DRIVE_CDROM}, {"/dev/cdwriter", DRIVE_CDROM},

1 0

Stefan Dösinger : wined3d: Honor WINED3DSPSM_NOT in ARB.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: d1cd08b7b35ddabfd3a699e562781d5d17216bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1cd08b7b35ddabfd3a699e56… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 19:32:04 2009 +0200 wined3d: Honor WINED3DSPSM_NOT in ARB. --- dlls/wined3d/arb_program_shader.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa8d068..21fc14c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4644,6 +4644,7 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; struct control_frame *control_frame; SHADER_BUFFER *buffer = ins->ctx->buffer; + BOOL bool_const; if(ins->handler_idx == WINED3DSIH_LOOP || ins->handler_idx == WINED3DSIH_REP) { @@ -4767,7 +4768,9 @@ static void shader_arb_handle_instruction(const struct wined3d_shader_instructio list_add_head(&priv->control_frames, &control_frame->entry); control_frame->type = IF; - if(!priv->muted && get_bool_const(ins, This, ins->src[0].reg.idx) == FALSE) + bool_const = get_bool_const(ins, This, ins->src[0].reg.idx); + if(ins->src[0].modifiers == WINED3DSPSM_NOT) bool_const = !bool_const; + if(!priv->muted && bool_const == FALSE) { shader_addline(buffer, "#if(FALSE){\n"); priv->muted = TRUE;

1 0

Stefan Dösinger : wined3d: Jump to the else branch if cond is false, not endif.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 8fb1e2acfbadde8a2ba52a191098d87432283335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb1e2acfbadde8a2ba52a191… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 19:18:39 2009 +0200 wined3d: Jump to the else branch if cond is false, not endif. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bc99dd4..aa8d068 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2707,7 +2707,7 @@ static void shader_hw_ifc(const struct wined3d_shader_instruction *ins) /* Invert the flag. We jump to the else label if the condition is NOT true */ comp = get_compare(invert_compare(ins->flags)); shader_addline(buffer, "SUBC TA, %s, %s;\n", src_name0, src_name1); - shader_addline(buffer, "BRA ifc_%u_endif (%s.x);\n", control_frame->ifc_no, comp); + shader_addline(buffer, "BRA ifc_%u_else (%s.x);\n", control_frame->ifc_no, comp); } else {

1 0

Stefan Dösinger : wined3d: Support writemasks on texkill in ARB.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: a07b50c94ce13199cf5b30ffe1a7a765e4192b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07b50c94ce13199cf5b30ffe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 18:01:46 2009 +0200 wined3d: Support writemasks on texkill in ARB. --- dlls/wined3d/arb_program_shader.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a52df83..bc99dd4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1622,9 +1622,28 @@ static void pshader_hw_texkill(const struct wined3d_shader_instruction *ins) if (ins->ctx->reg_maps->shader_version.major >= 2) { - /* The arb backend doesn't claim ps 2.0 support, but try to eat what the app feeds to us */ - shader_arb_get_dst_param(ins, dst, reg_dest); - shader_addline(buffer, "KIL %s;\n", reg_dest); + const char *kilsrc = "TA"; + BOOL is_color; + + shader_arb_get_register_name(ins, &dst->reg, reg_dest, &is_color); + if(dst->write_mask == WINED3DSP_WRITEMASK_ALL) + { + kilsrc = reg_dest; + } + else + { + /* Sigh. KIL doesn't support swizzles/writemasks. KIL passes a writemask, but ".xy" for example + * is not valid as a swizzle in ARB (needs ".xyyy"). Use SWZ to load the register properly, and set + * masked out components to 0(won't kill) + */ + char x = '0', y = '0', z = '0', w = '0'; + if(dst->write_mask & WINED3DSP_WRITEMASK_0) x = 'x'; + if(dst->write_mask & WINED3DSP_WRITEMASK_1) y = 'y'; + if(dst->write_mask & WINED3DSP_WRITEMASK_2) z = 'z'; + if(dst->write_mask & WINED3DSP_WRITEMASK_3) w = 'w'; + shader_addline(buffer, "SWZ TA, %s, %c, %c, %c, %c;\n", reg_dest, x, y, z, w); + } + shader_addline(buffer, "KIL %s;\n", kilsrc); } else { /* ARB fp doesn't like swizzles on the parameter of the KIL instruction. To mask the 4th component, * copy the register into our general purpose TMP variable, overwrite .w and pass TMP to KIL

1 0

Stefan Dösinger : wined3d: Initialize the used clip planes even if no clip emulation is used.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 3a327908dee712abe6d17e27b5648abeb81f8c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a327908dee712abe6d17e27b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 17:12:52 2009 +0200 wined3d: Initialize the used clip planes even if no clip emulation is used. --- dlls/wined3d/arb_program_shader.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d1ec4e1..a52df83 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3956,9 +3956,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW const WineD3D_GL_Info *gl_info = &dev->adapter->gl_info; find_vs_compile_args(shader, stateblock, &args->super); - /* This forces all local boolean constants to 1 to make them stateblock independent */ - args->boolclip.bools = shader->baseShader.reg_maps.local_bool_consts; - + args->boolclip_compare = 0; if(use_ps(stateblock)) { IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) stateblock->pixelShader; @@ -3970,14 +3968,11 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW else { args->ps_signature = ~0; - if(dev->vs_clipping) - { - args->boolclip.clip_control[0] = 0; - } - else + if(!dev->vs_clipping) { args->boolclip.clip_control[0] = ffp_clip_emul(stateblock) ? GL_LIMITS(texture_stages) : 0; } + /* Otherwise: Setting boolclip_compare set clip_control[0] to 0 */ } if(args->boolclip.clip_control[0]) @@ -3986,12 +3981,11 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW { args->boolclip.clip_control[1] = stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; } - else - { - args->boolclip.clip_control[1] = 0; - } + /* clip_control[1] was set to 0 by setting boolclip_compare to 0 */ } + /* This forces all local boolean constants to 1 to make them stateblock independent */ + args->boolclip.bools = shader->baseShader.reg_maps.local_bool_consts; /* TODO: Figure out if it would be better to store bool constants as bitmasks in the stateblock */ for(i = 0; i < MAX_CONST_B; i++) {

1 0

Stefan Dösinger : wined3d: Unclamp vertex colors for 3 .0 shaders in ARB if needed.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 4d86eac60ac621189fc3c1464ade49df363048c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d86eac60ac621189fc3c1464… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 22:09:36 2009 +0200 wined3d: Unclamp vertex colors for 3.0 shaders in ARB if needed. --- dlls/wined3d/arb_program_shader.c | 39 +++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e0bd5e7..d1ec4e1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -166,6 +166,7 @@ struct arb_vs_compiled_shader GLuint prgId; UINT int_consts[MAX_CONST_I]; char num_int_consts; + char need_color_unclamp; UINT pos_fixup; }; @@ -240,6 +241,7 @@ struct shader_arb_priv BOOL use_arbfp_fixed_func; struct wine_rb_tree fragment_shaders; BOOL last_ps_const_clamped; + BOOL last_vs_color_unclamp; struct wine_rb_tree signature_tree; DWORD ps_sig_number; @@ -3334,7 +3336,8 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win return found_sig->idx; } -static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_num, struct shader_arb_ctx_priv *priv_ctx) +static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_num, struct shader_arb_ctx_priv *priv_ctx, + struct arb_vs_compiled_shader *compiled) { unsigned int i, j; static const char *texcoords[8] = @@ -3454,6 +3457,16 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu { if(semantic_idx == 0) priv_ctx->fog_output = decl_idx_to_string[reg_idx]; } + else + { + continue; + } + + if(strcmp(decl_idx_to_string[reg_idx], "result.color.primary") == 0 || + strcmp(decl_idx_to_string[reg_idx], "result.color.secondary") == 0) + { + compiled->need_color_unclamp = TRUE; + } } /* Map declared to declared */ @@ -3491,6 +3504,12 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu sig[j].semantic_idx == shader->output_signature[i].semantic_idx) { priv_ctx->vs_output[i] = decl_idx_to_string[sig[j].register_idx]; + + if(strcmp(priv_ctx->vs_output[i], "result.color.primary") == 0 || + strcmp(priv_ctx->vs_output[i], "result.color.secondary") == 0) + { + compiled->need_color_unclamp = TRUE; + } } } } @@ -3514,7 +3533,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; list_init(&priv_ctx.control_frames); - init_output_registers(This, args->ps_signature, &priv_ctx); + init_output_registers(This, args->ps_signature, &priv_ctx, compiled); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -4070,10 +4089,11 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { if (useVS) { struct arb_vs_compile_args compile_args; struct arb_vs_compiled_shader *compiled; + IWineD3DVertexShaderImpl *vs = (IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader; TRACE("Using vertex shader %p\n", This->stateBlock->vertexShader); - find_arb_vs_compile_args((IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader, This->stateBlock, &compile_args); - compiled = find_arb_vshader((IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader, &compile_args); + find_arb_vs_compile_args(vs, This->stateBlock, &compile_args); + compiled = find_arb_vshader(vs, &compile_args); priv->current_vprogram_id = compiled->prgId; priv->compiled_vprog = compiled; @@ -4086,6 +4106,17 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id); shader_arb_vs_local_constants(This); + + if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) { + priv->last_vs_color_unclamp = compiled->need_color_unclamp; + + if (GL_SUPPORT(ARB_COLOR_BUFFER_FLOAT)) { + GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, !compiled->need_color_unclamp)); + checkGLcall("glClampColorARB"); + } else { + FIXME("vertex color clamp needs to be changed, but extension not supported.\n"); + } + } } else if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { priv->current_vprogram_id = 0; glDisable(GL_VERTEX_PROGRAM_ARB);

1 0

Stefan Dösinger : wined3d: POW and LOG operate on the absolute value.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: f69fb5c011fcc55375c0f92616baf8ca832235c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69fb5c011fcc55375c0f9261… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 22:08:36 2009 +0200 wined3d: POW and LOG operate on the absolute value. --- dlls/wined3d/arb_program_shader.c | 81 ++++++++++++++++++++++++++++++++++--- 1 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c536b38..e0bd5e7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1489,15 +1489,12 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EXPP: instruction = "EXP"; break; case WINED3DSIH_FRC: instruction = "FRC"; break; case WINED3DSIH_LIT: instruction = "LIT"; break; - case WINED3DSIH_LOG: instruction = "LG2"; break; - case WINED3DSIH_LOGP: instruction = "LOG"; break; case WINED3DSIH_LRP: instruction = "LRP"; break; case WINED3DSIH_MAD: instruction = "MAD"; break; case WINED3DSIH_MAX: instruction = "MAX"; break; case WINED3DSIH_MIN: instruction = "MIN"; break; case WINED3DSIH_MOV: instruction = "MOV"; break; case WINED3DSIH_MUL: instruction = "MUL"; break; - case WINED3DSIH_POW: instruction = "POW"; break; case WINED3DSIH_SGE: instruction = "SGE"; break; case WINED3DSIH_SLT: instruction = "SLT"; break; case WINED3DSIH_SUB: instruction = "SUB"; break; @@ -2411,6 +2408,78 @@ static void shader_hw_dsy(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MUL%s %s, %s, ycorrection.y;\n", shader_arb_get_modifier(ins), dst, dst_name); } +static DWORD abs_modifier(DWORD mod, BOOL *need_abs) +{ + *need_abs = FALSE; + + switch(mod) + { + case WINED3DSPSM_NONE: return WINED3DSPSM_ABS; + case WINED3DSPSM_NEG: return WINED3DSPSM_ABS; + case WINED3DSPSM_BIAS: *need_abs = TRUE; return WINED3DSPSM_BIAS; + case WINED3DSPSM_BIASNEG: *need_abs = TRUE; return WINED3DSPSM_BIASNEG; + case WINED3DSPSM_SIGN: *need_abs = TRUE; return WINED3DSPSM_SIGN; + case WINED3DSPSM_SIGNNEG: *need_abs = TRUE; return WINED3DSPSM_SIGNNEG; + case WINED3DSPSM_COMP: *need_abs = TRUE; return WINED3DSPSM_COMP; + case WINED3DSPSM_X2: *need_abs = TRUE; return WINED3DSPSM_X2; + case WINED3DSPSM_X2NEG: *need_abs = TRUE; return WINED3DSPSM_X2NEG; + case WINED3DSPSM_DZ: *need_abs = TRUE; return WINED3DSPSM_DZ; + case WINED3DSPSM_DW: *need_abs = TRUE; return WINED3DSPSM_DW; + case WINED3DSPSM_ABS: return WINED3DSPSM_ABS; + case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + } + FIXME("Unknown modifier %u\n", mod); + return mod; +} + +static void shader_hw_log_pow(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + char src0[50], src1[50], dst[50]; + struct wined3d_shader_src_param src0_copy = ins->src[0]; + BOOL need_abs = FALSE; + const char *instr; + BOOL arg2 = FALSE; + + switch(ins->handler_idx) + { + case WINED3DSIH_LOG: instr = "LG2"; break; + case WINED3DSIH_LOGP: instr = "LOG"; break; + case WINED3DSIH_POW: instr = "POW"; arg2 = TRUE; break; + default: + ERR("Unexpected instruction %d\n", ins->handler_idx); + return; + } + + /* LOG, LOGP and POW operate on the absolute value of the input */ + src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); + + shader_arb_get_dst_param(ins, &ins->dst[0], dst); + shader_arb_get_src_param(ins, &src0_copy, 0, src0); + if(arg2) shader_arb_get_src_param(ins, &ins->src[1], 1, src1); + + if(need_abs) + { + shader_addline(buffer, "ABS TA, %s;\n", src0); + if(arg2) + { + shader_addline(buffer, "%s%s %s, TA, %s;\n", instr, shader_arb_get_modifier(ins), dst, src1); + } + else + { + shader_addline(buffer, "%s%s %s, TA;\n", instr, shader_arb_get_modifier(ins), dst); + } + } + else if(arg2) + { + shader_addline(buffer, "%s%s %s, %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0, src1); + } + else + { + shader_addline(buffer, "%s%s %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0); + } +} + static void shader_hw_loop(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; @@ -4306,8 +4375,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_LABEL */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, - /* WINED3DSIH_LOG */ shader_hw_map2gl, - /* WINED3DSIH_LOGP */ shader_hw_map2gl, + /* WINED3DSIH_LOG */ shader_hw_log_pow, + /* WINED3DSIH_LOGP */ shader_hw_log_pow, /* WINED3DSIH_LOOP */ shader_hw_loop, /* WINED3DSIH_LRP */ shader_hw_lrp, /* WINED3DSIH_M3x2 */ shader_hw_mnxn, @@ -4324,7 +4393,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, - /* WINED3DSIH_POW */ shader_hw_map2gl, + /* WINED3DSIH_POW */ shader_hw_log_pow, /* WINED3DSIH_RCP */ shader_hw_rsq_rcp, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ NULL,

1 0

Stefan Dösinger : wined3d: IFC requires GL_NV_fragment_program2.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: bd14b6e2b42b6f86032843ef098de03860635119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd14b6e2b42b6f86032843ef0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 25 14:44:00 2009 +0200 wined3d: IFC requires GL_NV_fragment_program2. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e2f4b5e..c536b38 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2989,7 +2989,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->usesfacing) + reg_maps->usestexldl || reg_maps->usesfacing || reg_maps->usesifc) { want_nv_prog = TRUE; } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index dc7cd5b..d23d037 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -705,6 +705,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usesmova = 1; } + else if(ins.handler_idx == WINED3DSIH_IFC) + { + reg_maps->usesifc = 1; + } limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index afdf642..e9b64bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -640,7 +640,8 @@ typedef struct shader_reg_maps unsigned usesrelconstF : 1; unsigned fog : 1; unsigned usestexldl : 1; - unsigned padding : 6; + unsigned usesifc : 1; + unsigned padding : 5; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009