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

Henri Verbeet : wined3d: Make sure we have an active GL context in IWineD3DSurfaceImpl_UnLoad().
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: db5b126da6c5099b4dab9c575a49afde93381b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5b126da6c5099b4dab9c575… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 26 10:07:09 2009 +0200 wined3d: Make sure we have an active GL context in IWineD3DSurfaceImpl_UnLoad(). --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 424d2e3..37cd88a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -836,6 +836,7 @@ static void surface_remove_pbo(IWineD3DSurfaceImpl *This) { static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DBaseTexture *texture = NULL; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; renderbuffer_entry_t *entry, *entry2; TRACE("(%p)\n", iface); @@ -866,6 +867,8 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DSurface_ModifyLocation(iface, SFLAG_INSRGBTEX, FALSE); This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + /* Destroy PBOs, but load them into real sysmem before */ if(This->Flags & SFLAG_PBO) { surface_remove_pbo(This);

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context before calling surface_remove_pbo() .
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 1b306c25e22c5de24342294b453f795fbeb64a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b306c25e22c5de24342294b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 26 10:07:10 2009 +0200 wined3d: Make sure we have an active GL context before calling surface_remove_pbo(). --- dlls/wined3d/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 37cd88a..e3070d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4826,6 +4826,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D * but it isn't set (yet) in all cases it is getting called. */ if((convert != NO_CONVERSION) && (This->Flags & SFLAG_PBO)) { TRACE("Removing the pbo attached to surface %p\n", This); + if (!device->isInDraw) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); surface_remove_pbo(This); }

1 0

Henri Verbeet : wined3d: Make sure we have an active GL context before calling d3dfmt_p8_upload_palette ().
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 626baad817415f62cec4bb5f75d806a793ed67f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=626baad817415f62cec4bb5f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 26 10:07:11 2009 +0200 wined3d: Make sure we have an active GL context before calling d3dfmt_p8_upload_palette(). --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e3070d2..bac2fe5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4094,6 +4094,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && (convert == NO_CONVERSION)) { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); @@ -4101,6 +4103,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); /* Re-upload the palette */ + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); d3dfmt_p8_upload_palette(iface, convert); } else { if(!(This->Flags & SFLAG_INSYSMEM)) {

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: 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: 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: 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 : winebuild: Open resource files in binary mode.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 07e835fffb202ff5b60f594c9a00069297295065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e835fffb202ff5b60f594c9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 24 21:10:55 2009 +0200 winebuild: Open resource files in binary mode. --- tools/winebuild/res16.c | 2 +- tools/winebuild/res32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c index a957ca8..8a26ae2 100644 --- a/tools/winebuild/res16.c +++ b/tools/winebuild/res16.c @@ -168,7 +168,7 @@ void load_res16_file( const char *name, DLLSPEC *spec ) void *base; struct stat st; - if ((fd = open( name, O_RDONLY )) == -1) fatal_perror( "Cannot open %s", name ); + if ((fd = open( name, O_RDONLY | O_BINARY )) == -1) fatal_perror( "Cannot open %s", name ); if ((fstat( fd, &st ) == -1)) fatal_perror( "Cannot stat %s", name ); if (!st.st_size) fatal_error( "%s is an empty file\n", name ); #ifdef HAVE_MMAP diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 0aaf2f0..946523d 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -269,7 +269,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) void *base; struct stat st; - if ((fd = open( name, O_RDONLY )) == -1) fatal_perror( "Cannot open %s", name ); + if ((fd = open( name, O_RDONLY | O_BINARY )) == -1) fatal_perror( "Cannot open %s", name ); if ((fstat( fd, &st ) == -1)) fatal_perror( "Cannot stat %s", name ); if (!st.st_size) fatal_error( "%s is an empty file\n", name ); #ifdef HAVE_MMAP

1 0

Stefan Dösinger : wined3d: Beware of double negations.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: d4854b636c5c434357844b4f71711d789206953d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4854b636c5c434357844b4f7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 24 23:38:47 2009 +0200 wined3d: Beware of double negations. --- dlls/wined3d/arb_program_shader.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b30d3cc..e2f4b5e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1325,6 +1325,29 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "ADD %s, %s, TC;\n", dst_name, src_name[0]); } +static DWORD negate_modifiers(DWORD mod, char *extra_char) +{ + *extra_char = ' '; + switch(mod) + { + case WINED3DSPSM_NONE: return WINED3DSPSM_NEG; + case WINED3DSPSM_NEG: return WINED3DSPSM_NONE; + case WINED3DSPSM_BIAS: return WINED3DSPSM_BIASNEG; + case WINED3DSPSM_BIASNEG: return WINED3DSPSM_BIAS; + case WINED3DSPSM_SIGN: return WINED3DSPSM_SIGNNEG; + case WINED3DSPSM_SIGNNEG: return WINED3DSPSM_SIGN; + case WINED3DSPSM_COMP: *extra_char = '-'; return WINED3DSPSM_COMP; + case WINED3DSPSM_X2: return WINED3DSPSM_X2NEG; + case WINED3DSPSM_X2NEG: return WINED3DSPSM_X2; + case WINED3DSPSM_DZ: *extra_char = '-'; return WINED3DSPSM_DZ; + case WINED3DSPSM_DW: *extra_char = '-'; return WINED3DSPSM_DW; + case WINED3DSPSM_ABS: return WINED3DSPSM_ABSNEG; + case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + } + FIXME("Unknown modifier %u\n", mod); + return mod; +} + static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_dst_param *dst = &ins->dst[0]; @@ -1343,9 +1366,15 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) { shader_addline(buffer, "MOV%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[1]); } else { - shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); + struct wined3d_shader_src_param src0_copy = ins->src[0]; + char extra_neg; + + /* src0 may have a negate srcmod set, so we can't blindly add "-" to the name */ + src0_copy.modifiers = negate_modifiers(src0_copy.modifiers, &extra_neg); + + shader_arb_get_src_param(ins, &src0_copy, 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, "ADD TA, %c%s, coefdiv.x;\n", extra_neg, src_name[0]); /* No modifiers supported on CMP */ shader_addline(buffer, "CMP %s, TA, %s, %s;\n", dst_name, src_name[1], src_name[2]);

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