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

Henri Verbeet : d3d11/tests: Add a test for constant buffer alignment.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 5d4b5d731c136489dbf257dd9d5284799260895c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4b5d731c136489dbf257dd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:04 2017 +0200 d3d11/tests: Add a test for constant buffer alignment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9e3f695..7f34fbd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2322,12 +2322,12 @@ static void test_texture3d_interfaces(void) static void test_create_buffer(void) { ID3D10Buffer *d3d10_buffer; + HRESULT expected_hr, hr; D3D11_BUFFER_DESC desc; ID3D11Buffer *buffer; ID3D11Device *device; unsigned int i; ULONG refcount; - HRESULT hr; static const struct test { @@ -2531,7 +2531,6 @@ static void test_create_buffer(void) D3D11_BUFFER_DESC obtained_desc; D3D10_BUFFER_DESC d3d10_desc; ID3D10Device *d3d10_device; - HRESULT expected_hr; desc.ByteWidth = 1024; desc.Usage = D3D11_USAGE_DEFAULT; @@ -2605,6 +2604,18 @@ static void test_create_buffer(void) ID3D10Buffer_Release(d3d10_buffer); } + memset(&desc, 0, sizeof(desc)); + desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + for (i = 0; i <= 32; ++i) + { + desc.ByteWidth = i; + expected_hr = !i || i % 16 ? E_INVALIDARG : S_OK; + hr = ID3D11Device_CreateBuffer(device, &desc, NULL, &buffer); + ok(hr == expected_hr, "Got unexpected hr %#x for constant buffer size %u.\n", hr, i); + if (SUCCEEDED(hr)) + ID3D11Buffer_Release(buffer); + } + refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Henri Verbeet : d3d10core/tests: Add a test for constant buffer alignment.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: ec248a9e38b90dd921a57980c6ac465d2098d3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec248a9e38b90dd921a57980c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:05 2017 +0200 d3d10core/tests: Add a test for constant buffer alignment. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f05fa74..364a2ab 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1699,12 +1699,12 @@ static void test_create_texture3d(void) static void test_create_buffer(void) { ID3D11Buffer *d3d11_buffer; + HRESULT expected_hr, hr; D3D10_BUFFER_DESC desc; ID3D10Buffer *buffer; ID3D10Device *device; unsigned int i; ULONG refcount; - HRESULT hr; static const struct test { @@ -1820,6 +1820,18 @@ static void test_create_buffer(void) if (SUCCEEDED(hr)) ID3D10Buffer_Release(buffer); + memset(&desc, 0, sizeof(desc)); + desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + for (i = 0; i <= 32; ++i) + { + desc.ByteWidth = i; + expected_hr = !i || i % 16 ? E_INVALIDARG : S_OK; + hr = ID3D10Device_CreateBuffer(device, &desc, NULL, &buffer); + ok(hr == expected_hr, "Got unexpected hr %#x for constant buffer size %u.\n", hr, i); + if (SUCCEEDED(hr)) + ID3D10Buffer_Release(buffer); + } + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); }

1 0

Henri Verbeet : wined3d: Only warn about 0 stencil ops in gl_stencil_op().
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 059784221822f00dde5810f2c8a1e4b08f862246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=059784221822f00dde5810f2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:06 2017 +0200 wined3d: Only warn about 0 stencil ops in gl_stencil_op(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index df5a3b1..a59e913 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -827,7 +827,10 @@ static GLenum gl_stencil_op(enum wined3d_stencil_op op) case WINED3D_STENCIL_OP_DECR: return GL_DECR_WRAP; default: - FIXME("Unrecognized stencil op %#x.\n", op); + if (!op) + WARN("Unrecognized stencil op %#x.\n", op); + else + FIXME("Unrecognized stencil op %#x.\n", op); return GL_KEEP; } }

1 0

Józef Kucia : wined3d: Generate variables for control point phase temporary registers.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: ac1d2f1e2f8c68b4d5c8a1cf7b9e9f9f79840785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1d2f1e2f8c68b4d5c8a1cf7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 25 10:22:09 2017 +0200 wined3d: Generate variables for control point phase temporary registers. 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7a9007e..1dce957 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7582,6 +7582,8 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con shader_addline(buffer, "void hs_control_point_phase()\n{\n"); if ((phase = hs->phases.control_point)) { + for (i = 0; i < phase->temporary_count; ++i) + shader_addline(buffer, "vec4 R%u;\n", i); if (FAILED(shader_generate_code(shader, buffer, reg_maps, &priv_ctx, phase->start, phase->end))) return 0; shader_addline(buffer, "setup_hs_output(hs_out);\n");

1 0

Józef Kucia : wined3d: Do not use "temporary" bit field for SM4+ shaders.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 114f9791d25fd64bc1bcb66f928b55f0f9240d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=114f9791d25fd64bc1bcb66f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 25 10:22:10 2017 +0200 wined3d: Do not use "temporary" bit field for SM4+ shaders. Avoids generating needless variables for temporary registers in hull 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1dce957..8a00aa2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2587,7 +2587,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont for (i = 0; i < reg_maps->temporary_count; ++i) shader_addline(buffer, "vec4 R%u;\n", i); } - else + else if (version->major < 4) { for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) {

1 0

Józef Kucia : wined3d: Avoid barrier() in tessellation control shader if possible.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 4597ef6696d75d244e5078a89bac18a1431b936f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4597ef6696d75d244e5078a89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 25 10:22:11 2017 +0200 wined3d: Avoid barrier() in tessellation control shader if possible. Synchronization is only needed when output variables are read. 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 | 2 +- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8a00aa2..1cfc0e6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7610,7 +7610,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con shader_addline(buffer, "void main()\n{\n"); shader_addline(buffer, "hs_control_point_phase();\n"); - if (hs->phases.fork_count || hs->phases.join_count) + if (reg_maps->vocp) shader_addline(buffer, "barrier();\n"); for (i = 0; i < hs->phases.fork_count; ++i) shader_glsl_generate_shader_phase_invocation(buffer, &hs->phases.fork[i], "fork", i); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 144dbff..8827641 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -801,6 +801,10 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w reg_maps->rt_mask |= (1u << reg->idx[0].offset); break; + case WINED3DSPR_OUTCONTROLPOINT: + reg_maps->vocp = 1; + break; + default: TRACE("Not recording register of type %#x and [%#x][%#x].\n", reg->type, reg->idx[0].offset, reg->idx[1].offset); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1da788e..eb5d316 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1012,7 +1012,8 @@ struct wined3d_shader_reg_maps WORD usescall : 1; WORD usespow : 1; WORD point_size : 1; - WORD padding : 2; + WORD vocp : 1; + WORD padding : 1; DWORD rt_mask; /* Used render targets, 32 max. */

1 0

Józef Kucia : wined3d: Implement hull shader vocp register.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: aff0cbb9c707f05d6c67b0c42084b4b1a43c3f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0cbb9c707f05d6c67b0c42… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 25 10:22:12 2017 +0200 wined3d: Implement hull shader vocp register. 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 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cfc0e6..73ab7a6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3066,6 +3066,31 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "gl_TessCoord"); break; + case WINED3DSPR_OUTCONTROLPOINT: + if (reg->idx[0].rel_addr) + { + if (reg->idx[1].rel_addr) + sprintf(register_name, "shader_out[%s + %u].reg[%s + %u]", + rel_param0.param_str, reg->idx[0].offset, + rel_param1.param_str, reg->idx[1].offset); + else + sprintf(register_name, "shader_out[%s + %u].reg[%u]", + rel_param0.param_str, reg->idx[0].offset, + reg->idx[1].offset); + } + else if (reg->idx[1].rel_addr) + { + sprintf(register_name, "shader_out[%u].reg[%s + %u]", + reg->idx[0].offset, rel_param1.param_str, + reg->idx[1].offset); + } + else + { + sprintf(register_name, "shader_out[%u].reg[%u]", + reg->idx[0].offset, reg->idx[1].offset); + } + break; + case WINED3DSPR_PATCHCONST: if (version->type == WINED3D_SHADER_TYPE_HULL) sprintf(register_name, "hs_out[%u]", reg->idx[0].offset);

1 0

Józef Kucia : d3d11/tests: Do not recreate SO buffer in test_quad_tessellation().
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 57d813c6e4ead3eeac8f5521bfc0cbe14c3d410c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d813c6e4ead3eeac8f5521b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:09:57 2017 +0200 d3d11/tests: Do not recreate SO buffer in test_quad_tessellation(). 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/d3d11/tests/d3d11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7f34fbd..895225d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18647,8 +18647,7 @@ static void test_quad_tessellation(void) ID3D11DeviceContext_SOSetTargets(context, 0, NULL, NULL); check_triangles(so_buffer, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw)); - ID3D11Buffer_Release(so_buffer); - so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, sizeof(zero_data), zero_data); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)so_buffer, 0, NULL, zero_data, 0, 0); ID3D11HullShader_Release(hs); hr = ID3D11Device_CreateHullShader(device, hs_quad_cw_code, sizeof(hs_quad_cw_code), NULL, &hs); @@ -18661,8 +18660,7 @@ static void test_quad_tessellation(void) ID3D11DeviceContext_SOSetTargets(context, 0, NULL, NULL); check_triangles(so_buffer, expected_quad_cw, ARRAY_SIZE(expected_quad_cw)); - ID3D11Buffer_Release(so_buffer); - so_buffer = create_buffer(device, D3D11_BIND_STREAM_OUTPUT, sizeof(zero_data), zero_data); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)so_buffer, 0, NULL, zero_data, 0, 0); ID3D11DeviceContext_SOSetTargets(context, 1, &so_buffer, &offset); query_desc.Query = D3D11_QUERY_SO_STATISTICS_STREAM0;

1 0

Józef Kucia : d3d9: Validate D3DQUERYTYPE.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: c4e4357eb5058520aec7ccdf40562037f761bafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e4357eb5058520aec7ccdf4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:09:58 2017 +0200 d3d9: Validate D3DQUERYTYPE. 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/d3d9/query.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 4ca2205..335a960 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -185,6 +185,12 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER { HRESULT hr; + if (type > D3DQUERYTYPE_MEMORYPRESSURE) + { + WARN("Invalid query type %#x.\n", type); + return D3DERR_NOTAVAILABLE; + } + query->IDirect3DQuery9_iface.lpVtbl = &d3d9_query_vtbl; query->refcount = 1;

1 0

Józef Kucia : wined3d: Implement SO statistics queries.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: dfa3be5c9da87bf0a58f0ebe7af5647eeff2b15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa3be5c9da87bf0a58f0ebe7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 24 17:09:59 2017 +0200 wined3d: Implement SO statistics queries. 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/context.c | 64 ++++++++++++- dlls/wined3d/directx.c | 16 ++++ dlls/wined3d/query.c | 200 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 3 +- dlls/wined3d/wined3d_private.h | 31 +++++++ include/wine/wined3d.h | 49 ++++++---- 6 files changed, 343 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfa3be5c9da87bf0a58f0…

1 0