April 2017 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9: Compare parameter definition instead of parameter handle in IsParameterUsed ().
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: c30b91d38235e34d5764ac196fd147212bbb894b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30b91d38235e34d5764ac196… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 14 13:17:07 2017 +0300 d3dx9: Compare parameter definition instead of parameter handle in IsParameterUsed(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 31 +++++++++++++++++++++++++------ dlls/d3dx9_36/tests/effect.c | 4 +--- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 49e8a88..8dc4738 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3011,6 +3011,30 @@ static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3 return ret; } +static BOOL is_same_parameter(void *param1_, struct d3dx_parameter *param2) +{ + struct d3dx_parameter *param1 = (struct d3dx_parameter *)param1_; + BOOL matches; + unsigned int i, member_count; + + matches = !strcmp(param1->name, param2->name) && param1->class == param2->class + && param1->type == param2->type && param1->rows == param2->rows + && param1->columns == param2->columns && param1->element_count == param2->element_count + && param1->member_count == param2->member_count; + + member_count = param1->element_count ? param1->element_count : param1->member_count; + + if (!matches || !member_count) + return matches; + + for (i = 0; i < member_count; ++i) + { + if (!is_same_parameter(&param1->members[i], &param2->members[i])) + return FALSE; + } + return TRUE; +} + static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) { return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); @@ -3733,11 +3757,6 @@ static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_ return FALSE; } -static BOOL compare_param_ptr(void *param_comp, struct d3dx_parameter *param) -{ - return param_comp == param; -} - static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3756,7 +3775,7 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL pass = &tech->passes[i]; for (j = 0; j < pass->state_count; ++j) { - if (walk_state_dep(&pass->states[j], compare_param_ptr, param)) + if (walk_state_dep(&pass->states[j], is_same_parameter, param)) { TRACE("Returning TRUE.\n"); return TRUE; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a21d4e1..9c318b4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4532,12 +4532,10 @@ static void test_isparameterused_param_with_children_(unsigned int line, ID3DXEf param = effect->lpVtbl->GetParameterByName(effect, NULL, name); ok_(__FILE__, line)(!!param, "GetParameterByName failed for %s.\n", name); - todo_wine_if(effect2 && expected_result) ok_(__FILE__, line)(effect->lpVtbl->IsParameterUsed(effect, param, tech) == expected_result, "Unexpected IsParameterUsed() result for %s (referenced by handle).\n", name); - if (!effect2) - test_isparameterused_children(line, effect, tech, param); + test_isparameterused_children(line, effect, tech, param); } static void test_effect_isparameterused(IDirect3DDevice9 *device)

1 0

Daniel Lehman : msvcrt: Add __ExceptionPtrAssign.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 867a27c96429cafaf8858c361625612b7817e951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=867a27c96429cafaf8858c361… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 4 10:00:31 2017 -0700 msvcrt: Add __ExceptionPtrAssign. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 12 ++++++++++++ 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 14e0fa1..fd8201b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1689,8 +1689,8 @@ @ stub ?_Xregex_error(a)std@@YAXW4error_type(a)regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z(str) _Xruntime_error @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2c0f3c9..99bffe0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -408,8 +408,8 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI(a)Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index dcaa089..cb7a043 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -686,8 +686,8 @@ @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 96afa6f..c2477e2 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -668,8 +668,8 @@ @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c12dcbc..443eac8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -664,8 +664,8 @@ @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() msvcr120.?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ -@ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b7431cb..b3bfc2e 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1765,6 +1765,18 @@ void __cdecl __ExceptionPtrCopy(exception_ptr *ep, const exception_ptr *copy) } /********************************************************************* + * ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z + * ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z + */ +void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign) +{ + TRACE("(%p %p)\n", ep, assign); + + /* don't destroy object stored in ep */ + *ep = *assign; +} + +/********************************************************************* * ?__ExceptionPtrRethrow@@YAXPBX(a)Z * ?__ExceptionPtrRethrow@@YAXPEBX(a)Z */

1 0

Stefan Dösinger : d3d9/tests: Accept another stale value in test_vshader_input.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: ea8ba70ad4749152831f447b932938f99bc26754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8ba70ad4749152831f447b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 17 22:14:56 2017 +0200 d3d9/tests: Accept another stale value in test_vshader_input. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f8860b7..6b5a576 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8090,8 +8090,14 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* WARP and r500 return a color from a previous draw. In case of WARP it is the last draw, which happens to + * be the one with quad4_color above. AMD's r500 uses the last D3DCOLOR attribute, which is the one from + * quad3_color. + * + * Newer AMD cards and Nvidia return zero. */ color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00000000, 1) || broken(warp), + ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) + || broken(color_match(color, 0x00ffff00, 1) && warp), "Got unexpected color 0x%08x for no color attribute test.\n", color); IDirect3DDevice9_SetVertexShader(device, NULL);

1 0

Stefan Dösinger : d3d9/tests: Accept WARP uninitialized texcoord alpha result on real cards.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 4e1f7b18bf79deaa8a8aa98ef8b1747565a8dc20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1f7b18bf79deaa8a8aa98ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 17 22:14:57 2017 +0200 d3d9/tests: Accept WARP uninitialized texcoord alpha result on real cards. My Radeon X1600 has the same behavior. This is consistent with the vertex shader case in test_uninitialized_varyings with ps3_texcoord_code. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6b5a576..db29c3f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7185,7 +7185,8 @@ static void pretransformed_varying_test(void) const DWORD *shader_code; DWORD color; BOOL todo; - BOOL broken_warp; + BOOL broken; + DWORD broken_color; } tests[] = { @@ -7200,7 +7201,8 @@ static void pretransformed_varying_test(void) {"depth", depth_code, 0x00cccccc, TRUE }, {"specular", specular_code, 0x004488ff, FALSE}, {"texcoord1", texcoord1_code, 0x00000000, FALSE}, - {"texcoord1 alpha", texcoord1_alpha_code, 0x00000000, FALSE, TRUE}, + /* texcoord .w is 1.0 on r500 and WARP. See also test_uninitialized_varyings(). */ + {"texcoord1 alpha", texcoord1_alpha_code, 0x00000000, FALSE, TRUE, 0x00ffffff}, }; /* Declare a monster vertex type :-) */ static const D3DVERTEXELEMENT9 decl_elements[] = { @@ -7287,7 +7289,6 @@ static void pretransformed_varying_test(void) 0x224488ff, /* Nothing special */ }, }; - D3DADAPTER_IDENTIFIER9 identifier; IDirect3DVertexDeclaration9 *decl; IDirect3DDevice9 *device; IDirect3D9 *d3d; @@ -7297,7 +7298,6 @@ static void pretransformed_varying_test(void) DWORD color; HWND window; HRESULT hr; - BOOL warp; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -7317,10 +7317,6 @@ static void pretransformed_varying_test(void) goto done; } - hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); - ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); - warp = adapter_is_warp(&identifier); - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); @@ -7356,7 +7352,8 @@ static void pretransformed_varying_test(void) "Test %s returned color 0x%08x, expected 0x%08x (todo).\n", tests[i].name, color, tests[i].color); else - ok(color_match(color, tests[i].color, 1) || broken(warp && tests[i].broken_warp), + ok(color_match(color, tests[i].color, 1) + || broken(color_match(color, tests[i].broken_color, 1) && tests[i].broken), "Test %s returned color 0x%08x, expected 0x%08x.\n", tests[i].name, color, tests[i].color);

1 0

Józef Kucia : wined3d: Prefer GLSL 1.50 for all shaders.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 95a936d8c237cf4493f4e211a697bf308672959e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a936d8c237cf4493f4e211a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 18 11:24:10 2017 +0200 wined3d: Prefer GLSL 1.50 for all shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 48 +++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1451116..57b9138 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -352,11 +352,9 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } -static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_info, - const struct wined3d_shader_version *version) +static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_info) { - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] - || (version && version->type == WINED3D_SHADER_TYPE_COMPUTE)) + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)) return 150; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) return 130; @@ -365,9 +363,9 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf } static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *buffer, - const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) + const struct wined3d_gl_info *gl_info) { - unsigned int glsl_version = shader_glsl_get_version(gl_info, version); + unsigned int glsl_version = shader_glsl_get_version(gl_info); if (glsl_version >= 150 && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) shader_addline(buffer, "#version %u compatibility\n", glsl_version); else @@ -3252,10 +3250,9 @@ static const char *shader_glsl_get_rel_op(enum wined3d_shader_rel_op op) } } -static BOOL shader_glsl_has_core_grad(const struct wined3d_gl_info *gl_info, - const struct wined3d_shader_version *version) +static BOOL shader_glsl_has_core_grad(const struct wined3d_gl_info *gl_info) { - return shader_glsl_get_version(gl_info, version) >= 130 || gl_info->supported[EXT_GPU_SHADER4]; + return shader_glsl_get_version(gl_info) >= 130 || gl_info->supported[EXT_GPU_SHADER4]; } static void shader_glsl_get_coord_size(enum wined3d_shader_resource_type resource_type, @@ -3310,7 +3307,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (!type_part[0] && resource_type != WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY) FIXME("Unhandled resource type %#x.\n", resource_type); - if (!lod && grad && !shader_glsl_has_core_grad(gl_info, &ctx->shader->reg_maps.shader_version)) + if (!lod && grad && !shader_glsl_has_core_grad(gl_info)) { if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) suffix = "ARB"; @@ -3786,10 +3783,9 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) } else if (ins->handler_idx == WINED3DSIH_MOVA) { - const struct wined3d_shader_version *version = &ins->ctx->shader->reg_maps.shader_version; unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); - if (shader_glsl_get_version(gl_info, version) >= 130 || gl_info->supported[EXT_GPU_SHADER4]) + if (shader_glsl_get_version(gl_info) >= 130 || gl_info->supported[EXT_GPU_SHADER4]) { if (mask_size > 1) shader_addline(buffer, "ivec%d(round(%s)));\n", mask_size, src0_param.param_str); @@ -5006,10 +5002,9 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - if (!shader_glsl_has_core_grad(gl_info, &ins->ctx->shader->reg_maps.shader_version) - && !gl_info->supported[ARB_SHADER_TEXTURE_LOD]) + if (!shader_glsl_has_core_grad(gl_info) && !gl_info->supported[ARB_SHADER_TEXTURE_LOD]) { - FIXME("texldd used, but not supported by hardware. Falling back to regular tex\n"); + FIXME("texldd used, but not supported by hardware. Falling back to regular tex.\n"); shader_glsl_tex(ins); return; } @@ -5042,7 +5037,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); - if (shader_version->type == WINED3D_SHADER_TYPE_PIXEL && !shader_glsl_has_core_grad(gl_info, shader_version) + if (shader_version->type == WINED3D_SHADER_TYPE_PIXEL && !shader_glsl_has_core_grad(gl_info) && !gl_info->supported[ARB_SHADER_TEXTURE_LOD]) { /* Plain GLSL only supports Lod sampling functions in vertex shaders. @@ -6672,7 +6667,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl string_buffer_clear(buffer); - shader_glsl_add_version_declaration(buffer, gl_info, &vs->reg_maps.shader_version); + shader_glsl_add_version_declaration(buffer, gl_info); if (per_vertex_point_size) { @@ -6963,7 +6958,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; - shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); + shader_glsl_add_version_declaration(buffer, gl_info); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) @@ -7260,7 +7255,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context priv_ctx.cur_vs_args = args; priv_ctx.string_buffers = string_buffers; - shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); + shader_glsl_add_version_declaration(buffer, gl_info); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DRAW_INSTANCED]) @@ -7344,7 +7339,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.string_buffers = string_buffers; - shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); + shader_glsl_add_version_declaration(buffer, gl_info); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) @@ -7414,14 +7409,15 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * GLuint shader_id; unsigned int i; - shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); + memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.string_buffers = string_buffers; + + shader_glsl_add_version_declaration(buffer, gl_info); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_COMPUTE_SHADER]) shader_addline(buffer, "#extension GL_ARB_compute_shader : enable\n"); - memset(&priv_ctx, 0, sizeof(priv_ctx)); - priv_ctx.string_buffers = string_buffers; shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); for (i = 0; i < reg_maps->tgsm_count; ++i) @@ -7854,7 +7850,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr string_buffer_clear(buffer); - shader_glsl_add_version_declaration(buffer, gl_info, NULL); + shader_glsl_add_version_declaration(buffer, gl_info); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); @@ -8426,7 +8422,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } lowest_disabled_stage = stage; - shader_glsl_add_version_declaration(buffer, gl_info, NULL); + shader_glsl_add_version_declaration(buffer, gl_info); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); @@ -9944,7 +9940,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s shader_model = 4; /* Support for texldd and texldl instructions in pixel shaders is required * for SM3. */ - else if (shader_glsl_has_core_grad(gl_info, NULL) || gl_info->supported[ARB_SHADER_TEXTURE_LOD]) + else if (shader_glsl_has_core_grad(gl_info) || gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_model = 3; else shader_model = 2;

1 0

Józef Kucia : wined3d: Load all layers for render target views.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 9ffacc434e90d80dbdfb107b10f02a759f2266f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ffacc434e90d80dbdfb107b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 18 11:24:11 2017 +0200 wined3d: Load all layers for render target views. For layered rendering to array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/view.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c6d3450..1c324a6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -507,7 +507,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s rt = wined3d_texture_from_resource(rtv->resource); if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) { - wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding); wined3d_texture_invalidate_location(rt, rtv->sub_resource_idx, ~rtv->resource->draw_binding); } else @@ -527,7 +527,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) - wined3d_texture_load_location(ds->container, dsv->sub_resource_idx, context, location); + wined3d_rendertarget_view_load_location(dsv, context, location); else wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 294ed9a..93788df 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -398,6 +398,25 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg } } +void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, + struct wined3d_context *context, DWORD location) +{ + struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_load_location(buffer_from_resource(resource), context, location); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = view->sub_resource_idx; + for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_load_location(texture, sub_resource_idx, context, location); +} + static void wined3d_render_target_view_cs_init(void *object) { struct wined3d_rendertarget_view *view = object; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e48b49..13e375a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3458,6 +3458,8 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, + struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; struct wined3d_shader_resource_view {

1 0

Józef Kucia : wined3d: Prepare all layers for render target views.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 481999ce44fc919178f7a90dd8fb428cb2029371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481999ce44fc919178f7a90dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 18 11:24:12 2017 +0200 wined3d: Prepare all layers for render target views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 5 ++--- dlls/wined3d/view.c | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1c324a6..15b3791 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -512,7 +512,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } else { - wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_rendertarget_view_prepare_location(rtv, context, rtv->resource->draw_binding); } } @@ -524,12 +524,11 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note * that we never copy the stencil data.*/ DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) wined3d_rendertarget_view_load_location(dsv, context, location); else - wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); + wined3d_rendertarget_view_prepare_location(dsv, context, location); } if (!context_apply_draw_state(context, device, state)) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 93788df..e1e1956 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -398,6 +398,25 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg } } +void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, + struct wined3d_context *context, DWORD location) +{ + struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for resources %s.\n", debug_d3dresourcetype(resource->type)); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = view->sub_resource_idx; + for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); +} + void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 13e375a..ff5b242 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3460,6 +3460,8 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view, + struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; struct wined3d_shader_resource_view {

1 0

Alexandre Julliard : glu32: Import projection functions from Mesa.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: wine Branch: master Commit: 03c5ab2e725b52fafea388a2f13c38afff9a7e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c5ab2e725b52fafea388a2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 14 09:24:13 2017 +0200 glu32: Import projection functions from Mesa. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 4 +- dlls/glu32/glu.c | 66 ---------- dlls/glu32/glu32.spec | 12 +- dlls/glu32/project.c | 327 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 336 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03c5ab2e725b52fafea38…

1 0

Francois Gouget : testbot/WineRunTask: Fix a task timeout vs test unit timeout mixup.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: 5d7b9a8af83f1fbecb84cede591b42b0b5d3df67 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5d7b9a8af83f1fbecb84cede… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 12:16:00 2017 +0200 testbot/WineRunTask: Fix a task timeout vs test unit timeout mixup. If a test unit timed out don't complaining that it did not report some failures, even if the task as a whole did not time out. This is important for the WineTest runs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index dec73a6..40e1780 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -568,7 +568,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # Verify the summary lines if (!$CurrentIsPolluted) { - if ($LineFailures != 0 and $SummaryFailures == 0 and !$TimedOut) + if ($LineFailures != 0 and $SummaryFailures == 0 and $Rc != 258) { LogTaskError("$Dll:$Unit has unreported failures\n"); $LogFailures++;

1 0

Francois Gouget : testbot/WineRunTask: Rename some variables to avoid ambiguity.
by Alexandre Julliard 19 Apr '17

19 Apr '17

Module: tools Branch: master Commit: 7212d7bb13339be0c8ad9f29a5d4585570c411e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7212d7bb13339be0c8ad9f29… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 18 12:16:14 2017 +0200 testbot/WineRunTask: Rename some variables to avoid ambiguity. $TaskTimedOut is set if the task timed out. It may not be set if an individual test unit times out when running WineTest for instance. $TaskFailures keeps track of the failure count for the task which is the cumulated failure count for all its test units. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 40e1780..cb12777 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -442,7 +442,7 @@ if (!$Pid) # my $NewStatus = 'completed'; -my ($TestFailures, $TimedOut, $TAError, $PossibleCrash); +my ($TaskFailures, $TaskTimedOut, $TAError, $PossibleCrash); Debug(Elapsed($Start), " Waiting for the script (", $Task->Timeout, "s timeout)\n"); if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) { @@ -450,8 +450,8 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) if ($ErrMessage =~ /timed out waiting for the child process/) { LogTaskError("The task timed out\n"); - $TestFailures = 1; - $TimedOut = 1; + $TaskFailures = 1; + $TaskTimedOut = 1; } else { @@ -626,7 +626,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } close($LogFile); - if (!$IsWineTest or $TimedOut) + if (!$IsWineTest or $TaskTimedOut) { # This is either not a Wine test, which means the report need not follow # the Wine test standards, or the report got truncated due to the @@ -648,7 +648,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $LogFailures++; } # $LogFailures can legitimately be undefined in case of a timeout - $TestFailures += $LogFailures || 0; + $TaskFailures += $LogFailures || 0; } else { @@ -674,4 +674,4 @@ FatalTAError(undef, $TAError, $PossibleCrash) if (defined $TAError); # Wrap up # -WrapUpAndExit($NewStatus, $TestFailures); +WrapUpAndExit($NewStatus, $TaskFailures);

1 0