December 2016 - Wine-commits

Józef Kucia : wined3d: Implement return instruction.
by Alexandre Julliard 08 Dec '16

08 Dec '16

Module: wine Branch: master Commit: b9b8e775ea97a800264fda59717faac7af3f3562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b8e775ea97a800264fda597… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:42:55 2016 +0100 wined3d: Implement return instruction. Based on a patch by Andrew Wesie. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 6 +- dlls/d3d11/tests/d3d11.c | 6 +- dlls/wined3d/glsl_shader.c | 150 ++++++++++++++++++++++++++++-------------- 3 files changed, 106 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9b8e775ea97a800264fd…

1 0

Andrew Wesie : d3d11/tests: Add test for return in a conditional.
by Alexandre Julliard 08 Dec '16

08 Dec '16

Module: wine Branch: master Commit: 809ad52ae6c4d762ca568487cf9c240af4f592bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=809ad52ae6c4d762ca568487c… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Dec 7 12:42:56 2016 +0100 d3d11/tests: Add test for return in a conditional. 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 | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d8fc21e..7c6e875 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11690,6 +11690,90 @@ static void test_uav_load(void) release_test_context(&test_context); } +static void test_sm4_ret_instruction(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + struct uvec4 constant; + ID3D11Device *device; + ID3D11Buffer *cb; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint c; + + float4 main() : SV_TARGET + { + if (c == 1) + return float4(1, 0, 0, 1); + if (c == 2) + return float4(0, 1, 0, 1); + if (c == 3) + return float4(0, 0, 1, 1); + return float4(1, 1, 1, 1); + } +#endif + 0x43425844, 0x9ee6f808, 0xe74009f3, 0xbb1adaf2, 0x432e97b5, 0x00000001, 0x000001c4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x0000014c, 0x00000040, 0x00000053, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x08000020, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, + 0x00000001, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x08000020, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0304001f, 0x0010000a, + 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, + 0x3f800000, 0x0100003e, 0x01000015, 0x08000020, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x00004001, 0x00000003, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e, 0x01000015, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + constant.x = 1; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + constant.x = 2; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + constant.x = 3; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffff0000, 0); + + constant.x = 4; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -11754,4 +11838,5 @@ START_TEST(d3d11) test_shader_input_registers_limits(); test_stencil_separate(); test_uav_load(); + test_sm4_ret_instruction(); }

1 0

Andrew Wesie : d3d10core/tests: Add test for return in a conditional.
by Alexandre Julliard 08 Dec '16

08 Dec '16

Module: wine Branch: master Commit: cf38e53900b7e90419e9aa19c9bd71f8ba3e0add URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf38e53900b7e90419e9aa19c… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Dec 7 12:42:57 2016 +0100 d3d10core/tests: Add test for return in a conditional. 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/d3d10core/tests/device.c | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f278f42..778f33c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9970,6 +9970,88 @@ static void test_stencil_separate(void) release_test_context(&test_context); } +static void test_sm4_ret_instruction(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps; + struct uvec4 constant; + ID3D10Device *device; + ID3D10Buffer *cb; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint c; + + float4 main() : SV_TARGET + { + if (c == 1) + return float4(1, 0, 0, 1); + if (c == 2) + return float4(0, 1, 0, 1); + if (c == 3) + return float4(0, 0, 1, 1); + return float4(1, 1, 1, 1); + } +#endif + 0x43425844, 0x9ee6f808, 0xe74009f3, 0xbb1adaf2, 0x432e97b5, 0x00000001, 0x000001c4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x0000014c, 0x00000040, 0x00000053, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x08000020, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, + 0x00000001, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x08000020, 0x00100012, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0304001f, 0x0010000a, + 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, + 0x3f800000, 0x0100003e, 0x01000015, 0x08000020, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x00004001, 0x00000003, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, + 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e, 0x01000015, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + memset(&constant, 0, sizeof(constant)); + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + constant.x = 1; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + + constant.x = 2; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + + constant.x = 3; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffff0000, 0); + + constant.x = 4; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -10026,4 +10108,5 @@ START_TEST(device) test_ddy(); test_shader_input_registers_limits(); test_stencil_separate(); + test_sm4_ret_instruction(); }

1 0

Józef Kucia : wined3d: Do not generate shader epilogue in subroutines.
by Alexandre Julliard 08 Dec '16

08 Dec '16

Module: wine Branch: master Commit: 4e2ee0e452c7060a120dd6edff7ac9fdd13b2808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2ee0e452c7060a120dd6edf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:42:58 2016 +0100 wined3d: Do not generate shader epilogue in subroutines. 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 | 57 ++++++++++++++++++++++-------------------- dlls/wined3d/shader.c | 9 ++++--- dlls/wined3d/wined3d_private.h | 9 ++++--- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b3e7607..88f4465 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2625,7 +2625,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_LOOP: - sprintf(register_name, "aL%u", ins->ctx->loop_state->current_reg - 1); + sprintf(register_name, "aL%u", ins->ctx->state->current_loop_reg - 1); break; case WINED3DSPR_SAMPLER: @@ -4309,7 +4309,7 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) /* FIXME: I don't think nested loops will work correctly this way. */ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; + struct wined3d_shader_parser_state *state = ins->ctx->state; struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; @@ -4347,65 +4347,65 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) if (loop_control.step > 0) { shader_addline(buffer, "for (aL%u = %u; aL%u < (%u * %d + %u); aL%u += %d)\n{\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); + state->current_loop_depth, loop_control.start, + state->current_loop_depth, loop_control.count, loop_control.step, loop_control.start, + state->current_loop_depth, loop_control.step); } else if (loop_control.step < 0) { shader_addline(buffer, "for (aL%u = %u; aL%u > (%u * %d + %u); aL%u += %d)\n{\n", - loop_state->current_depth, loop_control.start, - loop_state->current_depth, loop_control.count, loop_control.step, loop_control.start, - loop_state->current_depth, loop_control.step); + state->current_loop_depth, loop_control.start, + state->current_loop_depth, loop_control.count, loop_control.step, loop_control.start, + state->current_loop_depth, loop_control.step); } else { shader_addline(buffer, "for (aL%u = %u, tmpInt%u = 0; tmpInt%u < %u; tmpInt%u++)\n{\n", - loop_state->current_depth, loop_control.start, loop_state->current_depth, - loop_state->current_depth, loop_control.count, - loop_state->current_depth); + state->current_loop_depth, loop_control.start, state->current_loop_depth, + state->current_loop_depth, loop_control.count, + state->current_loop_depth); } } else { shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", - loop_state->current_depth, loop_state->current_reg, - src1_param.reg_name, loop_state->current_depth, src1_param.reg_name, - loop_state->current_depth, loop_state->current_reg, src1_param.reg_name); + state->current_loop_depth, state->current_loop_reg, + src1_param.reg_name, state->current_loop_depth, src1_param.reg_name, + state->current_loop_depth, state->current_loop_reg, src1_param.reg_name); } - ++loop_state->current_reg; + ++state->current_loop_reg; } else { shader_addline(buffer, "for (;;)\n{\n"); } - ++loop_state->current_depth; + ++state->current_loop_depth; } static void shader_glsl_end(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; + struct wined3d_shader_parser_state *state = ins->ctx->state; shader_addline(ins->ctx->buffer, "}\n"); if (ins->handler_idx == WINED3DSIH_ENDLOOP) { - --loop_state->current_depth; - --loop_state->current_reg; + --state->current_loop_depth; + --state->current_loop_reg; } if (ins->handler_idx == WINED3DSIH_ENDREP) { - --loop_state->current_depth; + --state->current_loop_depth; } } static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) { + struct wined3d_shader_parser_state *state = ins->ctx->state; const struct wined3d_shader *shader = ins->ctx->shader; - struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; const struct wined3d_shader_lconst *constant; struct glsl_src_param src0_param; const DWORD *control_values = NULL; @@ -4426,18 +4426,18 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) if (control_values) { shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %d; tmpInt%d++) {\n", - loop_state->current_depth, loop_state->current_depth, - control_values[0], loop_state->current_depth); + state->current_loop_depth, state->current_loop_depth, + control_values[0], state->current_loop_depth); } else { shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %s; tmpInt%d++) {\n", - loop_state->current_depth, loop_state->current_depth, - src0_param.param_str, loop_state->current_depth); + state->current_loop_depth, state->current_loop_depth, + src0_param.param_str, state->current_loop_depth); } - ++loop_state->current_depth; + ++state->current_loop_depth; } static void shader_glsl_switch(const struct wined3d_shader_instruction *ins) @@ -4537,6 +4537,9 @@ static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { shader_addline(ins->ctx->buffer, "}\n"); shader_addline(ins->ctx->buffer, "void subroutine%u()\n{\n", ins->src[0].reg.idx[0].offset); + + /* Subroutines appear at the end of the shader. */ + ins->ctx->state->in_subroutine = TRUE; } static void shader_glsl_call(const struct wined3d_shader_instruction *ins) @@ -4557,7 +4560,7 @@ static void shader_glsl_ret(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->shader->reg_maps.shader_version; - if (version->major >= 4) + if (version->major >= 4 && !ins->ctx->state->in_subroutine) { shader_glsl_generate_shader_epilogue(ins->ctx); shader_addline(ins->ctx->buffer, "return;\n"); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a34694b..d434a64 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2104,7 +2104,7 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_st const struct wined3d_shader_frontend *fe = shader->frontend; void *fe_data = shader->frontend_data; struct wined3d_shader_version shader_version; - struct wined3d_shader_loop_state loop_state; + struct wined3d_shader_parser_state state; struct wined3d_shader_instruction ins; struct wined3d_shader_tex_mx tex_mx; struct wined3d_shader_context ctx; @@ -2112,15 +2112,16 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_st /* Initialize current parsing state. */ tex_mx.current_row = 0; - loop_state.current_depth = 0; - loop_state.current_reg = 0; + state.current_loop_depth = 0; + state.current_loop_reg = 0; + state.in_subroutine = FALSE; ctx.shader = shader; ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; ctx.tex_mx = &tex_mx; - ctx.loop_state = &loop_state; + ctx.state = &state; ctx.backend_data = backend_ctx; ins.ctx = &ctx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e6dcb0..859b89f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -900,10 +900,11 @@ struct wined3d_shader_tex_mx DWORD texcoord_w[2]; }; -struct wined3d_shader_loop_state +struct wined3d_shader_parser_state { - UINT current_depth; - UINT current_reg; + unsigned int current_loop_depth; + unsigned int current_loop_reg; + BOOL in_subroutine; }; struct wined3d_shader_context @@ -913,7 +914,7 @@ struct wined3d_shader_context const struct wined3d_shader_reg_maps *reg_maps; struct wined3d_string_buffer *buffer; struct wined3d_shader_tex_mx *tex_mx; - struct wined3d_shader_loop_state *loop_state; + struct wined3d_shader_parser_state *state; void *backend_data; };

1 0

Józef Kucia : d3d8/tests: Add test showing that primitive restart must be disabled.
by Alexandre Julliard 08 Dec '16

08 Dec '16

Module: wine Branch: master Commit: 30b8fb0f76d0941fd609365c755d857d42cd9cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b8fb0f76d0941fd609365c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:42:59 2016 +0100 d3d8/tests: Add test showing that primitive restart must be disabled. 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/d3d8/tests/visual.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 34d34b1..bf7058c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9528,6 +9528,158 @@ static void test_edge_antialiasing_blending(void) DestroyWindow(window); } +/* This test shows that 0xffff is valid index in D3D8. */ +static void test_max_index16(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct vertex + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 0xffff}; + static const unsigned int vertex_count = 0xffff + 1; + + D3DADAPTER_IDENTIFIER8 identifier; + IDirect3DVertexBuffer8 *vb; + IDirect3DIndexBuffer8 *ib; + IDirect3DDevice8 *device; + struct vertex *vb_data; + IDirect3D8 *d3d8; + ULONG refcount; + D3DCOLOR color; + D3DCAPS8 caps; + HWND window; + BYTE *data; + HRESULT hr; + BOOL warp; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + + hr = IDirect3D8_GetAdapterIdentifier(d3d8, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); + + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexIndex < 0xffff) + { + skip("Max vertex index is lower than 0xffff (%#x).\n", caps.MaxVertexIndex); + IDirect3DDevice8_Release(device); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, vertex_count * sizeof(*green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(green_quad), (BYTE **)&vb_data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + vb_data[0] = green_quad[0]; + vb_data[1] = green_quad[1]; + vb_data[2] = green_quad[2]; + vb_data[0xffff] = green_quad[3]; + hr = IDirect3DVertexBuffer8_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer8_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetIndices(device, ib, 0); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(struct vertex)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, vertex_count, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 20, 20); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 620, 460); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer8_Release(ib); + IDirect3DVertexBuffer8_Release(vb); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9596,4 +9748,5 @@ START_TEST(visual) test_texture_blending(); test_color_clamping(); test_edge_antialiasing_blending(); + test_max_index16(); }

1 0

Józef Kucia : d3d9/tests: Add test showing that primitive restart must be disabled.
by Alexandre Julliard 08 Dec '16

08 Dec '16

Module: wine Branch: master Commit: 49f6aa32ef088460f982250d344db8a0e96307e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f6aa32ef088460f982250d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:43:00 2016 +0100 d3d9/tests: Add test showing that primitive restart must be disabled. 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/tests/visual.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e25e85c..b1916c4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -22018,13 +22018,13 @@ static void test_evict_bound_resources(void) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&data, 0); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), &data, 0); ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); memcpy(data, green_quad, sizeof(green_quad)); hr = IDirect3DVertexBuffer9_Unlock(vb); ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); - hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **)&data, 0); + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); memcpy(data, indices, sizeof(indices)); hr = IDirect3DIndexBuffer9_Unlock(ib); @@ -22032,7 +22032,7 @@ static void test_evict_bound_resources(void) hr = IDirect3DDevice9_SetIndices(device, ib); ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 4 * sizeof(DWORD)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*green_quad)); ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); @@ -22068,6 +22068,157 @@ static void test_evict_bound_resources(void) DestroyWindow(window); } +/* This test shows that 0xffff is valid index in D3D9. */ +static void test_max_index16(void) +{ + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct vertex + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xff, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 0xffff}; + static const unsigned int vertex_count = 0xffff + 1; + + D3DADAPTER_IDENTIFIER9 identifier; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + struct vertex *vb_data; + IDirect3D9 *d3d9; + ULONG refcount; + D3DCOLOR color; + D3DCAPS9 caps; + HWND window; + void *data; + HRESULT hr; + BOOL warp; + + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + + hr = IDirect3D9_GetAdapterIdentifier(d3d9, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); + + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.MaxVertexIndex < 0xffff) + { + skip("Max vertex index is lower than 0xffff (%#x).\n", caps.MaxVertexIndex); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, vertex_count * sizeof(*green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib, NULL); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&vb_data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + vb_data[0] = green_quad[0]; + vb_data[1] = green_quad[1]; + vb_data[2] = green_quad[2]; + vb_data[0xffff] = green_quad[3]; + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(struct vertex)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, vertex_count, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 20, 20); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 620, 460); + ok(color_match(color, 0x0000ff00, 1) || broken(warp), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22194,4 +22345,5 @@ START_TEST(visual) test_line_antialiasing_blending(); test_dsy(); test_evict_bound_resources(); + test_max_index16(); }

1 0

Józef Kucia : wined3d: Implement primitive restart.
by Alexandre Julliard 08 Dec '16

08 Dec '16

Module: wine Branch: master Commit: ffcea8af7720007c5cd58f796fc3d6e672ec26da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcea8af7720007c5cd58f796… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Dec 7 12:43:01 2016 +0100 wined3d: Implement primitive restart. Based on a patch by Andrew Wesie. 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/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 3 ++- dlls/ddraw/ddraw_private.h | 2 +- dlls/wined3d/context.c | 17 +++++++++++++++-- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 18753cd..d307265 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -432,7 +432,7 @@ BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 5772c11..c377992 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -664,7 +664,8 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR; + | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR + | WINED3D_NO_PRIMITIVE_RESTART; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fe4603b..731d441 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -61,7 +61,7 @@ struct FvfToDecl #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR) + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART) enum ddraw_device_state { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 727f074..2ce99cb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1634,16 +1634,17 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *color_format; struct wined3d_context *ret; + BOOL hdc_is_private = FALSE; BOOL auxBuffers = FALSE; HGLRC ctx, share_ctx; int pixel_format; unsigned int s; DWORD state; HDC hdc = 0; - BOOL hdc_is_private = FALSE; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1823,7 +1824,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - ret->d3d_info = &device->adapter->d3d_info; + ret->d3d_info = d3d_info; ret->state_table = device->StateTable; /* Mark all states dirty to force a proper initialization of the states @@ -1979,6 +1980,18 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, { GL_EXTCALL(glProvokingVertexEXT(GL_FIRST_VERTEX_CONVENTION_EXT)); } + if (!(d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART)) + { + if (gl_info->supported[ARB_ES3_COMPATIBILITY]) + { + gl_info->gl_ops.gl.p_glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX); + checkGLcall("Enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); + } + else + { + FIXME("OpenGL implementation does not support GL_PRIMITIVE_RESTART_FIXED_INDEX.\n"); + } + } if (gl_info->supported[ARB_CLIP_CONTROL]) GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); device->shader_backend->shader_init_context_state(ret); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5787c22..34c42be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -122,6 +122,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, + {"GL_ARB_ES3_compatibility", ARB_ES3_COMPATIBILITY }, {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, {"GL_ARB_fragment_coord_conventions", ARB_FRAGMENT_COORD_CONVENTIONS}, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, @@ -3635,6 +3636,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, + {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 26089ad..cb1647c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY, + ARB_ES3_COMPATIBILITY, ARB_EXPLICIT_ATTRIB_LOCATION, ARB_FRAGMENT_COORD_CONVENTIONS, ARB_FRAGMENT_PROGRAM, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6a720d0..6bbb672 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1267,6 +1267,7 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_FFP_LIGHTING 0x00000100 #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 #define WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR 0x00000400 +#define WINED3D_NO_PRIMITIVE_RESTART 0x00000800 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Julian Rüger : German translation for release 1.9.21
by Jeremy Newman 08 Dec '16

08 Dec '16

Module: website Branch: master Commit: 75cfd42fdc3724e5d8656471d35e11528e77a86e URL: http://source.winehq.org/git/website.git/?a=commit;h=75cfd42fdc3724e5d86564… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:52:34 2016 +0100 German translation for release 1.9.21 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016101401.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2016101401.xml b/news/de/2016101401.xml new file mode 100644 index 0000000..67d22b4 --- /dev/null +++ b/news/de/2016101401.xml @@ -0,0 +1,15 @@ +<news> +<date>14. Oktober 2016</date> +<title>Wine 1.9.21 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Erste Version eines HID-Minitreibers.</li> + <li>Unterstützung von Listen im RichEdit-Steuerelement.</li> + <li>Systray-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.21.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.22
by Jeremy Newman 08 Dec '16

08 Dec '16

Module: website Branch: master Commit: 3ff05e9fdcbf5ac270b46463b249c7f9a919c9d5 URL: http://source.winehq.org/git/website.git/?a=commit;h=3ff05e9fdcbf5ac270b464… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:55:41 2016 +0100 German translation for release 1.9.22 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016102801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016102801.xml b/news/de/2016102801.xml new file mode 100644 index 0000000..e0d57c0 --- /dev/null +++ b/news/de/2016102801.xml @@ -0,0 +1,16 @@ +<news> +<date>28. Oktober 2016</date> +<title>Wine 1.9.22 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.22 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.22">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Clipboard-Unterstützung unter MacOS an das neue Design angepasst.</li> + <li>Erste Implementierung von Bitmap-Rendering in Direct2D.</li> + <li>Weitere Implementierung von WebServices.</li> + <li>Weitere Fortschritte in Richtung HID-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.22.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.23
by Jeremy Newman 08 Dec '16

08 Dec '16

Module: website Branch: master Commit: e4a52d13f83c2d6a791875f69e6b0ceae501bb00 URL: http://source.winehq.org/git/website.git/?a=commit;h=e4a52d13f83c2d6a791875… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 8 15:58:35 2016 +0100 German translation for release 1.9.23 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016111101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016111101.xml b/news/de/2016111101.xml new file mode 100644 index 0000000..1bb8eed --- /dev/null +++ b/news/de/2016111101.xml @@ -0,0 +1,16 @@ +<news> +<date>11. November 2016</date> +<title>Wine 1.9.23 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.23 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.23">Neuerungen (en)</a> in dieser Version: +<ul> + <li>HID-Bus-Unterstützung für MacOS.</li> + <li>Farbschriftartenunterstützung in Direct2D.</li> + <li>Weitere Farbformate in Direct3D.</li> + <li>Deinstallations-Korrekturen in MSI.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.23.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0