October 2015 - Wine-commits

Dmitry Timoshkov : oleview: Remove useless check for hPrevInst.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 65187a0b9997a8251b5853e1df9dff418282a42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65187a0b9997a8251b5853e1d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:37 2015 +0800 oleview: Remove useless check for hPrevInst. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/oleview.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 5a11888..350f6ad 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -558,12 +558,9 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int { MSG msg; HANDLE hAccelTable; - - if(!hPrevInst) - { - if(!InitApplication(hInst)) - return FALSE; - } + + if(!InitApplication(hInst)) + return FALSE; if(!InitInstance(hInst, nCmdShow)) return FALSE;

1 0

Dmitry Timoshkov : oleview: Always check return value of SendMessage( TVM_GETITEM).
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 26db80b685e9be1191a892e149ec35bc71404072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26db80b685e9be1191a892e14… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 7 18:27:49 2015 +0800 oleview: Always check return value of SendMessage(TVM_GETITEM). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/oleview/tree.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 4a16081..decedc4 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -82,7 +82,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) tvis.hParent = item; tvis.hInsertAfter = TVI_LAST; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if (!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) return; if(!tvi.lParam || ((ITEM_INFO *)tvi.lParam)->loaded || !(((ITEM_INFO *)tvi.lParam)->cFlag&SHOWALL)) return; @@ -154,9 +154,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) while(hCur) { tvi.hItem = hCur; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(!tvi.lParam) + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) || !tvi.lParam) { hCur = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hCur); @@ -192,9 +190,7 @@ void ReleaseInst(HTREEITEM item) memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = item; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(!tvi.lParam) return; + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) || !tvi.lParam) return; pU = ((ITEM_INFO *)tvi.lParam)->pU; @@ -223,18 +219,18 @@ BOOL CreateRegPath(HTREEITEM item, WCHAR *buffer, int bufSize) { TVITEMW tvi; int bufLen; - BOOL ret; + BOOL ret = FALSE; memset(buffer, 0, bufSize * sizeof(WCHAR)); memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = item; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - ret = (tvi.lParam && ((ITEM_INFO *)tvi.lParam)->cFlag & REGPATH); + if (SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) + ret = (tvi.lParam && ((ITEM_INFO *)tvi.lParam)->cFlag & REGPATH); while(TRUE) { - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) break; if(tvi.lParam && (((ITEM_INFO *)tvi.lParam)->cFlag & (REGPATH|REGTOP))) { @@ -318,7 +314,7 @@ static void AddCOMandAll(void) while(curSearch) { tvi.hItem = curSearch; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); + if(!SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi)) break; if(tvi.lParam && !lstrcmpW(((ITEM_INFO *)tvi.lParam)->info, wszComp)) { @@ -631,15 +627,13 @@ void EmptyTree(void) TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)del); tvi.hItem = del; - SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); - - if(tvi.lParam) + if(SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi) && tvi.lParam) { if(((ITEM_INFO *)tvi.lParam)->loaded) ReleaseInst(del); HeapFree(GetProcessHeap(), 0, (ITEM_INFO *)tvi.lParam); - } - SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); + SendMessageW(globals.hTree, TVM_DELETEITEM, 0, (LPARAM)del); + } if(!cur) break; }

1 0

Riccardo Bortolato : wined3d: Pass a wined3d_box to wined3d_surface_map..
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 1d1487105d4d3a9133f0846d32363a0432812d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1487105d4d3a9133f0846d3… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:47 2015 +0200 wined3d: Pass a wined3d_box to wined3d_surface_map.. Introduced a new surface_check_block_align function that accepts a wined3d_box, eventually the old _rect version will be completely replaced. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/surface.c | 9 +++++++- dlls/d3d9/surface.c | 13 ++++++++++- dlls/ddraw/surface.c | 9 +++++++- dlls/wined3d/surface.c | 62 ++++++++++++++++++++++++++++---------------------- include/wine/wined3d.h | 2 +- 5 files changed, 64 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d1487105d4d3a9133f08…

1 0

Riccardo Bortolato : wined3d: Introduce new wined3d_texture_(un) map functions.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: eac95d30b66609c5c924ec36b6049e680c63015f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac95d30b66609c5c924ec36b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:48 2015 +0200 wined3d: Introduce new wined3d_texture_(un)map functions. Initial usage in d3d11. Also removed wined3d_volume_from_resource. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/texture.c | 28 ++++--------------------- dlls/wined3d/texture.c | 47 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/volume.c | 5 ----- dlls/wined3d/wined3d.spec | 3 ++- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 4 +++- 6 files changed, 59 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eac95d30b66609c5c924e…

1 0

Riccardo Bortolato : wined3d: Pass wined3d_texture and sub_resource idx to device_volume_created callback.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 9621737c8e7ce3c67f998ef096ea321f9ea2f04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9621737c8e7ce3c67f998ef09… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:49 2015 +0200 wined3d: Pass wined3d_texture and sub_resource idx to device_volume_created callback. Store wined3d_texture and sub_resource in d3d8_volume. Updated the d3d8_volume_LockBox to make use of wined3d_texture_map. Also updated d3d9, d3d11, ddraw callbacks accordingly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 6 +++--- dlls/d3d8/d3d8_private.h | 6 ++++-- dlls/d3d8/device.c | 10 +++++----- dlls/d3d8/volume.c | 11 +++++++---- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 8 ++++---- dlls/d3d9/volume.c | 6 +++--- dlls/ddraw/ddraw.c | 6 +++--- dlls/wined3d/volume.c | 2 +- include/wine/wined3d.h | 3 ++- 10 files changed, 34 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9621737c8e7ce3c67f998…

1 0

Riccardo Bortolato : d3d8: Make use of wined3d_texture_unmap in d3d8_volume_UnlockBox.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: d49ad6c608c3e5effa0915527d87a5d13c6b4d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49ad6c608c3e5effa0915527… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:50 2015 +0200 d3d8: Make use of wined3d_texture_unmap in d3d8_volume_UnlockBox. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 52562ad..81cd40e 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -167,7 +167,7 @@ static HRESULT WINAPI d3d8_volume_UnlockBox(IDirect3DVolume8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_volume_unmap(volume->wined3d_volume); + hr = wined3d_texture_unmap(volume->wined3d_texture, volume->sub_resource_idx); wined3d_mutex_unlock(); return hr;

1 0

Riccardo Bortolato : d3d8: Don' t use a wined3d_volume in d3d8_volume_GetDesc.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: eeea2af596859fc2b77ca28685a7a1545e6fe718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeea2af596859fc2b77ca2868… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Oct 6 10:36:51 2015 +0200 d3d8: Don't use a wined3d_volume in d3d8_volume_GetDesc. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 3 +-- dlls/d3d8/device.c | 2 +- dlls/d3d8/volume.c | 9 ++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index aec4831..ab6a3d4 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -206,12 +206,11 @@ struct d3d8_volume struct d3d8_resource resource; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; - struct wined3d_volume *wined3d_volume; struct d3d8_texture *texture; }; void volume_init(struct d3d8_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d8_swapchain { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6ba476e..818f601 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3029,7 +3029,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; - volume_init(d3d_volume, wined3d_texture, sub_resource_idx, volume, parent_ops); + volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); *parent = d3d_volume; TRACE("Created volume %p.\n", d3d_volume); diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 81cd40e..e37330c 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -116,13 +116,13 @@ static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DES { struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface); struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); @@ -203,12 +203,11 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops = }; void volume_init(struct d3d8_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) { volume->IDirect3DVolume8_iface.lpVtbl = &d3d8_volume_vtbl; d3d8_resource_init(&volume->resource); volume->resource.refcount = 0; - volume->wined3d_volume = wined3d_volume; volume->texture = wined3d_texture_get_parent(wined3d_texture); volume->wined3d_texture = wined3d_texture; volume->sub_resource_idx = sub_resource_idx;

1 0

Matteo Bruni : wined3d: Store supported varyings count in d3d_limits.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 93db8e97da2690c62a5d4586d6214632a98df344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93db8e97da2690c62a5d4586d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 6 14:24:19 2015 +0200 wined3d: Store supported varyings count in d3d_limits. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6a321db..b1d9869 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5161,6 +5161,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh caps->ps_1x_max_value = 0.0f; } + caps->varying_count = 0; caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (use_nv_clip(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_VS_CLIPPING; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6801bcc..6d51432 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3707,6 +3707,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) adapter->d3d_info.limits.ps_version = shader_caps.ps_version; adapter->d3d_info.limits.vs_uniform_count = shader_caps.vs_uniform_count; adapter->d3d_info.limits.ps_uniform_count = shader_caps.ps_uniform_count; + adapter->d3d_info.limits.varying_count = shader_caps.varying_count; adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); adapter->d3d_info.xyzrhw = vertex_caps.xyzrhw; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c85b334..54f004f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7632,6 +7632,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->vs_uniform_count = gl_info->limits.glsl_vs_float_constants; caps->ps_uniform_count = gl_info->limits.glsl_ps_float_constants; + caps->varying_count = gl_info->limits.glsl_varyings; /* FIXME: The following line is card dependent. -8.0 to 8.0 is the * Direct3D minimum requirement. diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2d80877..8574881 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1989,6 +1989,7 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s caps->vs_uniform_count = 0; caps->ps_uniform_count = 0; caps->ps_1x_max_value = 0.0f; + caps->varying_count = 0; caps->wined3d_caps = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d57899..fe3f97d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -774,6 +774,7 @@ struct shader_caps DWORD vs_uniform_count; DWORD ps_uniform_count; float ps_1x_max_value; + DWORD varying_count; DWORD wined3d_caps; }; @@ -1748,6 +1749,7 @@ struct wined3d_d3d_limits UINT vs_version, gs_version, ps_version; DWORD vs_uniform_count; DWORD ps_uniform_count; + UINT varying_count; UINT ffp_textures; UINT ffp_blend_stages; UINT ffp_vertex_blend_matrices;

1 0

Matteo Bruni : wined3d: Avoid reading uninitialized texcoord varyings in FFP replacement fragment shaders.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: f511787423f468a679837761ef4ea841ba7a3fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=f511787423f468a679837761e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 7 00:15:08 2015 +0200 wined3d: Avoid reading uninitialized texcoord varyings in FFP replacement fragment shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 44 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/utils.c | 37 +++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++-- 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 54f004f..c58ea07 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6295,20 +6295,35 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (legacy_context) { + shader_addline(buffer, "vec4 ffp_texcoord[%u];\n", MAX_TEXTURES); shader_addline(buffer, "float ffp_varying_fogcoord;\n"); } else { + shader_addline(buffer, "vec4 ffp_texcoord[%u];\n", MAX_TEXTURES); declare_in_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); } shader_addline(buffer, "void main()\n{\n"); + for (stage = 0; stage < MAX_TEXTURES; ++stage) + { + if (tex_map & (1u << stage)) + { + if (settings->pointsprite) + shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", stage); + else if (settings->texcoords_initialized & (1u << stage)) + shader_addline(buffer, "ffp_texcoord[%u] = gl_TexCoord[%u];\n", stage, stage); + else + shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", stage); + } + } + if (legacy_context && settings->fog != WINED3D_FFP_PS_FOG_OFF) shader_addline(buffer, "ffp_varying_fogcoord = gl_FogFragCoord;\n"); if (lowest_disabled_stage < 7 && settings->emul_clipplanes) - shader_addline(buffer, "if (any(lessThan(gl_TexCoord[7], vec4(0.0)))) discard;\n"); + shader_addline(buffer, "if (any(lessThan(ffp_texcoord[7], vec4(0.0)))) discard;\n"); /* Generate texture sampling instructions) */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) @@ -6409,20 +6424,20 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * { if (settings->op[stage].projected == proj_count4) { - shader_addline(buffer, "ret.xy = (ret.xy * gl_TexCoord[%u].w) + gl_TexCoord[%u].xy;\n", + shader_addline(buffer, "ret.xy = (ret.xy * ffp_texcoord[%u].w) + ffp_texcoord[%u].xy;\n", stage, stage); - shader_addline(buffer, "ret.zw = gl_TexCoord[%u].ww;\n", stage); + shader_addline(buffer, "ret.zw = ffp_texcoord[%u].ww;\n", stage); } else { - shader_addline(buffer, "ret.xy = (ret.xy * gl_TexCoord[%u].z) + gl_TexCoord[%u].xy;\n", + shader_addline(buffer, "ret.xy = (ret.xy * ffp_texcoord[%u].z) + ffp_texcoord[%u].xy;\n", stage, stage); - shader_addline(buffer, "ret.zw = gl_TexCoord[%u].zz;\n", stage); + shader_addline(buffer, "ret.zw = ffp_texcoord[%u].zz;\n", stage); } } else { - shader_addline(buffer, "ret = gl_TexCoord[%u] + ret.xyxy;\n", stage); + shader_addline(buffer, "ret = ffp_texcoord[%u] + ret.xyxy;\n", stage); } shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", @@ -6434,12 +6449,12 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } else if (settings->op[stage].projected == proj_count3) { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].xyz);\n", + shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", stage, texture_function, stage, stage); } else { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, gl_TexCoord[%u].%s);\n", + shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].%s);\n", stage, texture_function, stage, stage, coord_mask); } @@ -8391,10 +8406,22 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, static void glsl_fragment_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + /* Because of settings->texcoords_initialized. */ + if (!use_ps(state) && context->gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(context->gl_info)) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_FOGENABLE))) glsl_fragment_pipe_fog(context, state, state_id); } +static void glsl_fragment_pipe_vs(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + /* Because of settings->texcoords_initialized. */ + if (!use_ps(state) && context->gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(context->gl_info)) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; +} + static void glsl_fragment_pipe_tex_transform(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -8447,6 +8474,7 @@ static void glsl_fragment_pipe_color_key(struct wined3d_context *context, static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, + {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_fragment_pipe_vs }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), glsl_fragment_pipe_invalidate_constants}, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8265b9c..41e72fe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4629,6 +4629,43 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d settings->color_key_enabled = 1; else settings->color_key_enabled = 0; + + /* texcoords_initialized is set to meaningful values only when GL doesn't + * support enough varyings to always pass around all the possible texture + * coordinates. + * This is used to avoid reading a varying not written by the vertex shader. + * Reading uninitialized varyings on core profile contexts results in an + * error while with builtin varyings on legacy contexts you get undefined + * behavior. */ + if (d3d_info->limits.varying_count + && d3d_info->limits.varying_count < wined3d_max_compat_varyings(gl_info)) + { + settings->texcoords_initialized = 0; + for (i = 0; i < MAX_TEXTURES; ++i) + { + if (use_vs(state)) + { + if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.output_registers & (1u << i)) + settings->texcoords_initialized |= 1u << i; + } + else + { + const struct wined3d_stream_info *si = &context->stream_info; + unsigned int coord_idx = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; + if ((state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX] >> WINED3D_FFP_TCI_SHIFT) + & WINED3D_FFP_TCI_MASK + || (coord_idx < MAX_TEXTURES && (si->use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx))))) + settings->texcoords_initialized |= 1u << i; + } + } + } + else + { + settings->texcoords_initialized = (1u << MAX_TEXTURES) - 1; + } + + settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] + && state->gl_primitive_type == GL_POINTS; } const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fe3f97d..e8a9929 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1865,8 +1865,10 @@ struct ffp_frag_settings enum wined3d_ffp_ps_fog_mode fog; unsigned char sRGB_write; unsigned char emul_clipplanes; - unsigned char color_key_enabled; - unsigned char padding; + unsigned char texcoords_initialized; + unsigned char color_key_enabled : 1; + unsigned char pointsprite : 1; + unsigned char padding : 6; }; struct ffp_frag_desc

1 0

Andrew Eikum : x3daudio: Forward older DLLs to x3daudio1_7.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: b2b5a085b5e288bbbb673c57eb6e6a04156735ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2b5a085b5e288bbbb673c57e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 6 13:01:24 2015 -0500 x3daudio: Forward older DLLs to x3daudio1_7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure | 4 +++- configure.ac | 3 ++- dlls/x3daudio1_0/Makefile.in | 4 ++++ dlls/x3daudio1_0/main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_0/x3daudio1_0.spec | 2 ++ dlls/x3daudio1_1/x3daudio1_1.spec | 4 ++-- dlls/x3daudio1_2/x3daudio1_2.spec | 4 ++-- dlls/x3daudio1_3/x3daudio1_3.spec | 4 ++-- dlls/x3daudio1_4/x3daudio1_4.spec | 4 ++-- dlls/x3daudio1_5/x3daudio1_5.spec | 4 ++-- dlls/x3daudio1_6/Makefile.in | 1 + dlls/x3daudio1_6/main.c | 9 +++++++++ dlls/x3daudio1_6/x3daudio1_6.spec | 4 ++-- dlls/x3daudio1_7/Makefile.in | 1 + 14 files changed, 70 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 6fdf7a6..33f0343 100755 --- a/configure +++ b/configure @@ -1364,6 +1364,7 @@ enable_wsock32 enable_wtsapi32 enable_wuapi enable_wuaueng +enable_x3daudio1_0 enable_x3daudio1_1 enable_x3daudio1_2 enable_x3daudio1_3 @@ -17935,13 +17936,14 @@ wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng +wine_fn_config_dll x3daudio1_0 enable_x3daudio1_0 wine_fn_config_dll x3daudio1_1 enable_x3daudio1_1 wine_fn_config_dll x3daudio1_2 enable_x3daudio1_2 wine_fn_config_dll x3daudio1_3 enable_x3daudio1_3 wine_fn_config_dll x3daudio1_4 enable_x3daudio1_4 wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5 wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6 -wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 +wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 implib wine_fn_config_dll xapofx1_1 enable_xapofx1_1 wine_fn_config_dll xapofx1_2 enable_xapofx1_2 wine_fn_config_dll xapofx1_3 enable_xapofx1_3 diff --git a/configure.ac b/configure.ac index 7e6e855..74ab202 100644 --- a/configure.ac +++ b/configure.ac @@ -3450,13 +3450,14 @@ WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) +WINE_CONFIG_DLL(x3daudio1_0) WINE_CONFIG_DLL(x3daudio1_1) WINE_CONFIG_DLL(x3daudio1_2) WINE_CONFIG_DLL(x3daudio1_3) WINE_CONFIG_DLL(x3daudio1_4) WINE_CONFIG_DLL(x3daudio1_5) WINE_CONFIG_DLL(x3daudio1_6) -WINE_CONFIG_DLL(x3daudio1_7) +WINE_CONFIG_DLL(x3daudio1_7,,[implib]) WINE_CONFIG_DLL(xapofx1_1) WINE_CONFIG_DLL(xapofx1_2) WINE_CONFIG_DLL(xapofx1_3) diff --git a/dlls/x3daudio1_0/Makefile.in b/dlls/x3daudio1_0/Makefile.in new file mode 100644 index 0000000..16d2868 --- /dev/null +++ b/dlls/x3daudio1_0/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_0.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_0/main.c b/dlls/x3daudio1_0/main.c new file mode 100644 index 0000000..52a5e3d --- /dev/null +++ b/dlls/x3daudio1_0/main.c @@ -0,0 +1,36 @@ +/* + * Copyright 2015 Andrew Eikum for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/x3daudio1_0/x3daudio1_0.spec b/dlls/x3daudio1_0/x3daudio1_0.spec new file mode 100644 index 0000000..6351da4 --- /dev/null +++ b/dlls/x3daudio1_0/x3daudio1_0.spec @@ -0,0 +1,2 @@ +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_1/x3daudio1_1.spec b/dlls/x3daudio1_1/x3daudio1_1.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_1/x3daudio1_1.spec +++ b/dlls/x3daudio1_1/x3daudio1_1.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_2/x3daudio1_2.spec b/dlls/x3daudio1_2/x3daudio1_2.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_2/x3daudio1_2.spec +++ b/dlls/x3daudio1_2/x3daudio1_2.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_3/x3daudio1_3.spec b/dlls/x3daudio1_3/x3daudio1_3.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_3/x3daudio1_3.spec +++ b/dlls/x3daudio1_3/x3daudio1_3.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_4/x3daudio1_4.spec b/dlls/x3daudio1_4/x3daudio1_4.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_4/x3daudio1_4.spec +++ b/dlls/x3daudio1_4/x3daudio1_4.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_5/x3daudio1_5.spec b/dlls/x3daudio1_5/x3daudio1_5.spec index 9a51f1b..6351da4 100644 --- a/dlls/x3daudio1_5/x3daudio1_5.spec +++ b/dlls/x3daudio1_5/x3daudio1_5.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_6.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_6.X3DAudioInitialize diff --git a/dlls/x3daudio1_6/Makefile.in b/dlls/x3daudio1_6/Makefile.in index ad59b8f..fa9046e 100644 --- a/dlls/x3daudio1_6/Makefile.in +++ b/dlls/x3daudio1_6/Makefile.in @@ -1,4 +1,5 @@ MODULE = x3daudio1_6.dll +IMPORTS = x3daudio1_7 C_SRCS = \ main.c diff --git a/dlls/x3daudio1_6/main.c b/dlls/x3daudio1_6/main.c index ea6732f..ab06cd6 100644 --- a/dlls/x3daudio1_6/main.c +++ b/dlls/x3daudio1_6/main.c @@ -23,6 +23,8 @@ #include "windef.h" #include "winbase.h" +#include "x3daudio.h" + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch (fdwReason) @@ -38,3 +40,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +void CDECL X3DA16_X3DAudioInitialize(UINT32 chanmask, float speedofsound, + X3DAUDIO_HANDLE handle) +{ + /* forward to 1.7 */ + X3DAudioInitialize(chanmask, speedofsound, handle); +} diff --git a/dlls/x3daudio1_6/x3daudio1_6.spec b/dlls/x3daudio1_6/x3daudio1_6.spec index 9a51f1b..6103b1b 100644 --- a/dlls/x3daudio1_6/x3daudio1_6.spec +++ b/dlls/x3daudio1_6/x3daudio1_6.spec @@ -1,2 +1,2 @@ -@ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) x3daudio1_7.X3DAudioCalculate +@ cdecl X3DAudioInitialize(long float ptr) X3DA16_X3DAudioInitialize diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in index 7487ca8..f3110e4 100644 --- a/dlls/x3daudio1_7/Makefile.in +++ b/dlls/x3daudio1_7/Makefile.in @@ -1,4 +1,5 @@ MODULE = x3daudio1_7.dll +IMPORTLIB = x3daudio1_7 C_SRCS = \ main.c

1 0