April 2016 - Wine-Devel - list.winehq.org

Re: mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP.

by Francois Gouget

On Wed, 20 Apr 2016, Andrew Eikum wrote: > mmdevapi doesn't exist on winxp. I'm not opposed to this change, but > does it matter? It fixes this failure: https://testbot.winehq.org/JobDetails.pl?Key=22355 Arguably the TestBot should have realized that mmdevapi is missing and skipped running the test altogether. But in the meantime this means further mmdevapi patches will not return spurious failures. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ In theory, theory and practice are the same, but in practice they're different.

April 20, 2016

Re: [PATCH 4/7] wined3d: Allocate system memory for complete textures.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22399 Your paranoid android. === w864 (64 bit device) === device.c:4317: Test failed: cw is 0xf60, expected 0x7f. device.c:4326: Test failed: Callback cw is 0xf60, expected 0x7f. === w1064 (64 bit device) === device.c:4317: Test failed: cw is 0xf60, expected 0x7f. device.c:4326: Test failed: Callback cw is 0xf60, expected 0x7f.

April 20, 2016

Re: [PATCH 4/7] wined3d: Allocate system memory for complete textures.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22398 Your paranoid android. === w8 (32 bit device) === device.c:1372: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1417: Test failed: Reset failed, hr 0x88760868. device.c:1419: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1423: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1430: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1431: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1432: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1433: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1434: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1435: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1440: Test failed: Screen width is 640, expected 800. device.c:1441: Test failed: Screen height is 480, expected 600. device.c:1447: Test failed: Back buffer width is 640, expected 800. device.c:1449: Test failed: Back buffer height is 480, expected 600. device.c:1479: Test failed: Screen width is 640, expected 1024. device.c:1480: Test failed: Screen height is 480, expected 768. device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480. === w864 (32 bit device) === device.c:1372: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1417: Test failed: Reset failed, hr 0x88760868. device.c:1419: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1423: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1430: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1431: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1432: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1433: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1434: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1435: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1440: Test failed: Screen width is 640, expected 800. device.c:1441: Test failed: Screen height is 480, expected 600. device.c:1447: Test failed: Back buffer width is 640, expected 800. device.c:1449: Test failed: Back buffer height is 480, expected 600. device.c:1479: Test failed: Screen width is 640, expected 1024. device.c:1480: Test failed: Screen height is 480, expected 768. device.c:2725: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2730: Test failed: The focus window is active. device.c:2738: Test failed: Got unexpected hr 0x88760869. device.c:2742: Test failed: Got unexpect screen size 800x600. device.c:2757: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2766: Test failed: Got unexpect screen size 800x600. device.c:2779: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2787: Test failed: Got unexpect width 640. device.c:2788: Test failed: Got unexpect height 480.

April 20, 2016

Re: [PATCH v2 1/8] wined3d: Alpha test emulation for core profile contexts.

by Henri Verbeet

On 20 April 2016 at 17:52, Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > 2016-04-20 12:50 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: >> On 19 April 2016 at 18:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >>> + /* alpha_func is the PASS condition, not the DISCARD condition. Instead of >>> + * flipping all the operators here, just negate the comparison below. */ >> As an aside, note that in general inverting operators isn't safe if >> there are potential NaNs involved. > > I'm not sure that matter here, although I can certainly swap the > operators and drop the negation. > No, I think it's correct like this. It was more of a general note that e.g. "pass(x < y);" isn't necessarily equivalent to "fail(x >= y);", while "fail(!(x < y));" is. >>> @@ -3091,6 +3091,13 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 >>> args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] >>> && state->gl_primitive_type == GL_POINTS; >>> >>> + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) >>> + args->alpha_test_func = WINED3D_CMP_ALWAYS - 1; >>> + else >>> + args->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] >>> + ? wined3d_sanitize_cmp_func(state->render_states[WINED3D_RS_ALPHAFUNC]) >>> + : WINED3D_CMP_ALWAYS) - 1; >> For what it's worth, what I originally had in mind was mapping >> WINED3D_CMP_ALWAYS to 0. I.e., masking with 7. This works as well. > > Ah, right. I can mask WINED3D_CMP_ALWAYS instead if you prefer > (although maybe in that case converting back to enum wined3d_cmp_func > would be a bit more convoluted?) I think it shouldn't be too bad, but it's not something I care strongly about.

April 20, 2016

Re: mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP.

by Andrew Eikum

mmdevapi doesn't exist on winxp. I'm not opposed to this change, but does it matter? Andrew On Wed, Apr 20, 2016 at 11:52:11AM +0200, Francois Gouget wrote: > RegGetValueW() was added later and should be avoided in the conformance tests. > > Signed-off-by: Francois Gouget <fgouget(a)free.fr> > --- > dlls/mmdevapi/tests/propstore.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c > index 06fe690..665136f 100644 > --- a/dlls/mmdevapi/tests/propstore.c > +++ b/dlls/mmdevapi/tests/propstore.c > @@ -173,7 +173,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) > > /* Note: the registry key exists even without calling IPropStore::Commit */ > size = sizeof(regval); > - ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); > + ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)&regval, &size); > ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); > ok(type == REG_DWORD, "Got wrong value type: %u\n", type); > ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval); > -- > 2.8.0.rc3 > >

April 20, 2016

Re: [PATCH 5/8] wined3d: Fixup vertex position in geometry shaders.

by Matteo Bruni

2016-04-20 12:50 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > Do we need this if we have GLSL 1.50 / ARB_fragment_coord_conventions? Probably not, although I haven't tried yet. I'll look into that too.

April 20, 2016

Re: [PATCH 3/8] wined3d: Simplify shader interface matching for SM4+ vertex shaders.

by Matteo Bruni

2016-04-20 12:50 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 19 April 2016 at 18:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> After some testing it looks like, with SM4+ on Windows: >> 1. Output registers have to match with input registers from the >> following shader stage (register index and mask). There is no "smart" >> matching of semantics like in SM3. >> 2. Using uninitialized varyings in SM4+ shaders doesn't give consistent >> results. >> That means we can simplify the relevant code quite a bit. Applications >> shouldn't be able to depend on particular values for uninitialized >> varyings so we can avoid explicitly initializing them. >> > Does that mean we don't need the separate "reorder" shader between the > stages? (Even more so if we have separate shader objects.) We shouldn't really need separate "reorder" shaders for SM4+, correct. At the moment I'm still making use of the separate shader for the setup_vs_output() function to be able to use the same VS variant both with and without a GS. Of course that means right now we need to compile the "setup" shader in that case which is arguably worse than a shader variant. I had in mind to look into that at some point after this first "pass" at fixing shaders matching but maybe that's not a good plan. I guess I'll have a shot at dropping the separate shader for SM4 and see what happens... > On 19 April 2016 at 18:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> -static void shader_glsl_setup_shader_output(struct shader_glsl_priv *priv, >> +static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, >> const struct wined3d_gl_info *gl_info, const DWORD *map, >> const struct wined3d_shader_signature *input_signature, >> const struct wined3d_shader_reg_maps *reg_maps_in, >> const struct wined3d_shader_signature *output_signature, >> - const struct wined3d_shader_reg_maps *reg_maps_out, const char *out_array_name) >> + const struct wined3d_shader_reg_maps *reg_maps_out) >> { >> struct wined3d_string_buffer *destination = string_buffer_get(&priv->string_buffers); >> BOOL legacy_context = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; >> @@ -5191,7 +5191,7 @@ static void shader_glsl_setup_shader_output(struct shader_glsl_priv *priv, >> else if (in_idx == in_count + 1) >> string_buffer_sprintf(destination, "gl_FrontSecondaryColor"); >> else >> - string_buffer_sprintf(destination, "%s[%u]", out_array_name, in_idx); >> + string_buffer_sprintf(destination, "%s[%u]", "ps_link", in_idx); >> >> if (!set[in_idx]) >> set[in_idx] = ~0u; >> @@ -5243,7 +5243,7 @@ static void shader_glsl_setup_shader_output(struct shader_glsl_priv *priv, >> else if (i == in_count + 1) >> string_buffer_sprintf(destination, "gl_FrontSecondaryColor"); >> else >> - string_buffer_sprintf(destination, "%s[%u]", out_array_name, i); >> + string_buffer_sprintf(destination, "%s[%u]", "ps_link", i); >> >> if (size == 1) >> shader_addline(buffer, "%s.%s = 0.0;\n", destination->buffer, reg_mask); > This looks like you should have just kept it the way it was in the > previous patch. Sure, I can drop that change. Actually it was like that until a couple of days ago (I reread these patches way too many times...)

April 20, 2016

Re: [PATCH v2 1/8] wined3d: Alpha test emulation for core profile contexts.

by Matteo Bruni

2016-04-20 12:50 GMT+02:00 Henri Verbeet <hverbeet(a)gmail.com>: > On 19 April 2016 at 18:56, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> + /* alpha_func is the PASS condition, not the DISCARD condition. Instead of >> + * flipping all the operators here, just negate the comparison below. */ > As an aside, note that in general inverting operators isn't safe if > there are potential NaNs involved. I'm not sure that matter here, although I can certainly swap the operators and drop the negation. >> + static const char *comparison_operator[] = >> + { >> + "", /* WINED3D_CMP_NEVER */ >> + "<", /* WINED3D_CMP_LESS */ >> + "==", /* WINED3D_CMP_EQUAL */ >> + "<=", /* WINED3D_CMP_LESSEQUAL */ >> + ">", /* WINED3D_CMP_GREATER */ >> + "!=", /* WINED3D_CMP_NOTEQUAL */ >> + ">=", /* WINED3D_CMP_GREATEREQUAL */ >> + "" /* WINED3D_CMP_ALWAYS */ >> + }; > I should have noticed the first time, but I think you'll want to make > the string pointers const as well. Right, will fix. >> @@ -3091,6 +3091,13 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 >> args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] >> && state->gl_primitive_type == GL_POINTS; >> >> + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) >> + args->alpha_test_func = WINED3D_CMP_ALWAYS - 1; >> + else >> + args->alpha_test_func = (state->render_states[WINED3D_RS_ALPHATESTENABLE] >> + ? wined3d_sanitize_cmp_func(state->render_states[WINED3D_RS_ALPHAFUNC]) >> + : WINED3D_CMP_ALWAYS) - 1; > For what it's worth, what I originally had in mind was mapping > WINED3D_CMP_ALWAYS to 0. I.e., masking with 7. This works as well. Ah, right. I can mask WINED3D_CMP_ALWAYS instead if you prefer (although maybe in that case converting back to enum wined3d_cmp_func would be a bit more convoluted?)

April 20, 2016

Re: [PATCH 8/8] d3d11/tests: Add a geometry shader test.

by Matteo Bruni

2016-04-20 9:33 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > On Tue, Apr 19, 2016 at 6:56 PM, Matteo Bruni <mbruni(a)codeweavers.com> wrote: >> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> >> --- >> dlls/d3d11/tests/d3d11.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 232 insertions(+) >> >> diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c >> index 713c9cf..0fafaaf 100644 >> --- a/dlls/d3d11/tests/d3d11.c >> +++ b/dlls/d3d11/tests/d3d11.c >> @@ -6569,6 +6569,237 @@ static void test_getdc(void) >> ok(!refcount, "Device has %u references left.\n", refcount); >> } >> >> +static void test_geometry_shader(void) >> +{ >> + static const struct >> + { >> + struct vec4 position; >> + unsigned int color; >> + } >> + vertex[] = >> + { >> + {{0.0f, 0.0f, 1.0f, 1.0f}, 0xffffff00}, >> + }; >> + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = >> + { >> + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, >> + {"COLOR", 0, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, > > It would be better to use D3D11 constants. Indeed. >> + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_10_0; > > Why should we limit this test to feature level 10_0? For no good reason, that's probably a remnant from a test or something... > >> + buffer_desc.ByteWidth = sizeof(vertex); >> + buffer_desc.Usage = D3D11_USAGE_DEFAULT; >> + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; >> + buffer_desc.CPUAccessFlags = 0; >> + buffer_desc.MiscFlags = 0; > > The "StructureByteStride" field is uninitialized. I suppose it doesn't > matter in practice because this field is used only for structured > buffers. Right, I'll fix that.

April 20, 2016

Re: [PATCH ] msvcr120/tests: Add critical section test.(try 2)

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=22393 Your paranoid android. === w2008s64 (64 bit msvcr120) === Found no trace of the test summary line or of a crash

April 20, 2016