March 2017 - Wine-Commits - list.winehq.org

Jacek Caban : xmllite/tests: Added reader_value helper.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 0c91228bb005b486cd49aac99606a21908e82fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c91228bb005b486cd49aac99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:50 2017 +0200 xmllite/tests: Added reader_value helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 152 ++++++++++---------------------------------- 1 file changed, 33 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c91228bb005b486cd49a…

1 0

Józef Kucia : wined3d: Pause transform feedback between draw calls.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 3ca84a348edc32d04778f3412e9c09cae32b3710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca84a348edc32d04778f3412… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:23 2017 +0200 wined3d: Pause transform feedback between draw calls. In order to avoid recording vertices generated by other operations, e.g. blits. 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/buffer.c | 4 +--- dlls/wined3d/context.c | 12 ++++++++++++ dlls/wined3d/drawprim.c | 37 ++++++++++++++++++++++++++++--------- dlls/wined3d/state.c | 7 +------ dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ba8b004..52cdc67 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -181,9 +181,7 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w * when deleting a potentially bound transform feedback buffer. * This may happen when the device is being destroyed. */ WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer); - GL_EXTCALL(glEndTransformFeedback()); - checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; + context_end_transform_feedback(context); } } } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3c297df..8427eb7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3687,6 +3687,18 @@ void context_apply_compute_state(struct wined3d_context *context, context->last_was_blit = FALSE; } +void context_end_transform_feedback(struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + if (context->transform_feedback_active) + { + GL_EXTCALL(glEndTransformFeedback()); + checkGLcall("glEndTransformFeedback"); + context->transform_feedback_active = 0; + context->transform_feedback_paused = 0; + } +} + static void context_setup_target(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b5537a8..3611bf5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -448,11 +448,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s gl_info = context->gl_info; if (context->transform_feedback_active && !use_transform_feedback(state)) - { - GL_EXTCALL(glEndTransformFeedback()); - checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; - } + context_end_transform_feedback(context); for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -564,7 +560,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } } - if (use_transform_feedback(state) && !context->transform_feedback_active) + if (use_transform_feedback(state)) { const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; GLenum primitive_mode = gl_primitive_type_from_d3d(shader->u.gs.output_type); @@ -576,9 +572,18 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s rasterizer_discard = TRUE; } - GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); - checkGLcall("glBeginTransformFeedback"); - context->transform_feedback_active = 1; + if (context->transform_feedback_paused) + { + GL_EXTCALL(glResumeTransformFeedback()); + checkGLcall("glResumeTransformFeedback"); + context->transform_feedback_paused = 0; + } + else if (!context->transform_feedback_active) + { + GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); + checkGLcall("glBeginTransformFeedback"); + context->transform_feedback_active = 1; + } } if (context->use_immediate_mode_draw || emulation) @@ -594,6 +599,20 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } + if (context->transform_feedback_active) + { + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) + { + GL_EXTCALL(glPauseTransformFeedback()); + checkGLcall("glPauseTransformFeedback"); + context->transform_feedback_paused = 1; + } + else + { + WARN("Cannot pause transform feedback operations.\n"); + } + } + if (rasterizer_discard) { glDisable(GL_RASTERIZER_DISCARD); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index dedde1e..e138936 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4982,12 +4982,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (context->transform_feedback_active) - { - GL_EXTCALL(glEndTransformFeedback()); - checkGLcall("glEndTransformFeedback"); - context->transform_feedback_active = 0; - } + context_end_transform_feedback(context); for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2f90efd..30625a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1690,7 +1690,8 @@ struct wined3d_context DWORD uses_uavs : 1; DWORD destroy_delayed : 1; DWORD transform_feedback_active : 1; - DWORD padding : 8; + DWORD transform_feedback_paused : 1; + DWORD padding : 7; DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask; @@ -1920,6 +1921,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, stru const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_free_event_query(struct wined3d_event_query *query) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Add support for rasterizer discard.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 591b17838e63d693d0fb57e085f6af8f9edec14c URL: http://source.winehq.org/git/wine.git/?a=commit;h=591b17838e63d693d0fb57e08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:22 2017 +0200 wined3d: Add support for rasterizer discard. 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 +++--- dlls/wined3d/drawprim.c | 15 ++++++++++++++- include/wine/wined3d.h | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c44afb4..1e7b5df 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16833,7 +16833,7 @@ static void test_stream_output_resume(void) check_texture_color(test_context.backbuffer, 0xffffffff, 0); draw_color_quad(&test_context, &red); - todo_wine check_texture_color(test_context.backbuffer, 0xffffffff, 0); + check_texture_color(test_context.backbuffer, 0xffffffff, 0); ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); draw_color_quad(&test_context, &green); @@ -16842,7 +16842,7 @@ static void test_stream_output_resume(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constants[1], 0, 0); ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); draw_color_quad(&test_context, &red); - todo_wine check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); draw_color_quad(&test_context, &red); @@ -16851,7 +16851,7 @@ static void test_stream_output_resume(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constants[2], 0, 0); ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); draw_color_quad(&test_context, &white); - todo_wine check_texture_color(test_context.backbuffer, 0xff0000ff, 0); + check_texture_color(test_context.backbuffer, 0xff0000ff, 0); ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); draw_color_quad(&test_context, &green); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e055361..b5537a8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -419,6 +419,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { + BOOL emulation = FALSE, rasterizer_discard = FALSE; const struct wined3d_fb_state *fb = state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_event_query *ib_query = NULL; @@ -428,7 +429,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s struct wined3d_context *context; unsigned int i, idx_size = 0; const void *idx_data = NULL; - BOOL emulation = FALSE; if (!index_count) return; @@ -569,6 +569,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; GLenum primitive_mode = gl_primitive_type_from_d3d(shader->u.gs.output_type); + if (shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + { + glEnable(GL_RASTERIZER_DISCARD); + checkGLcall("enable rasterizer discard"); + rasterizer_discard = TRUE; + } + GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); checkGLcall("glBeginTransformFeedback"); context->transform_feedback_active = 1; @@ -587,6 +594,12 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } + if (rasterizer_discard) + { + glDisable(GL_RASTERIZER_DISCARD); + checkGLcall("disable rasterizer discard"); + } + if (ib_query) wined3d_event_query_issue(ib_query, device); for (i = 0; i < context->num_buffer_queries; ++i) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4e2c800..f575547 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1518,6 +1518,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_MAX_STREAM_OUTPUT_BUFFERS 4 #define WINED3D_STREAM_OUTPUT_GAP 0xffffffff +#define WINED3D_NO_RASTERIZER_STREAM 0xffffffff #define WINED3D_VIEW_BUFFER_RAW 0x00000001 #define WINED3D_VIEW_BUFFER_APPEND 0x00000002

1 0

Józef Kucia : wined3d: Enable transform feedback if geometry shader with stream output is active.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 2e3300fa59d9792a5578e64929777277ee9a685d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3300fa59d9792a5578e6492… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:21 2017 +0200 wined3d: Enable transform feedback if geometry shader with stream output is active. 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 | 1 - dlls/wined3d/buffer.c | 22 +++++++++++++++++----- dlls/wined3d/drawprim.c | 25 +++++++++++++++++++++++++ dlls/wined3d/state.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 07a9f25..c44afb4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11489,7 +11489,6 @@ static void test_index_buffer_offset(void) for (i = 0; i < ARRAY_SIZE(expected_data); ++i) { data = get_readback_vec4(&rb, i, 0); - todo_wine ok(compare_vec4(data, &expected_data[i], 0) || broken(is_nvidia_device(device) && !(i % 2) && compare_vec4(data, &broken_result, 0)), "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cb3cbbd..ba8b004 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -144,7 +144,7 @@ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *c } /* Context activation is done by the caller. */ -static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const struct wined3d_context *context) +static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_resource *resource = &buffer->resource; @@ -152,10 +152,6 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const st if (!buffer->buffer_object) return; - GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); - checkGLcall("glDeleteBuffers"); - buffer->buffer_object = 0; - /* The stream source state handler might have read the memory of the * vertex buffer already and got the memory in the vbo which is not * valid any longer. Dirtify the stream source to force a reload. This @@ -177,9 +173,25 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const st device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); } if (buffer->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); + if (context->transform_feedback_active) + { + /* We have to make sure that transform feedback is not active + * when deleting a potentially bound transform feedback buffer. + * This may happen when the device is being destroyed. */ + WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer); + GL_EXTCALL(glEndTransformFeedback()); + checkGLcall("glEndTransformFeedback"); + context->transform_feedback_active = 0; + } + } } + GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); + checkGLcall("glDeleteBuffers"); + buffer->buffer_object = 0; + if (buffer->query) { wined3d_event_query_destroy(buffer->query); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 05a6380..e055361 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -406,6 +406,14 @@ static void remove_vbos(struct wined3d_context *context, } } +static BOOL use_transform_feedback(const struct wined3d_state *state) +{ + const struct wined3d_shader *shader; + if (!(shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) + return FALSE; + return shader->u.gs.so_desc.element_count; +} + /* Routine common to the draw primitive and draw indexed primitive routines */ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, @@ -439,6 +447,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } gl_info = context->gl_info; + if (context->transform_feedback_active && !use_transform_feedback(state)) + { + GL_EXTCALL(glEndTransformFeedback()); + checkGLcall("glEndTransformFeedback"); + context->transform_feedback_active = 0; + } + for (i = 0; i < gl_info->limits.buffers; ++i) { struct wined3d_texture *rt; @@ -549,6 +564,16 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } } + if (use_transform_feedback(state) && !context->transform_feedback_active) + { + const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; + GLenum primitive_mode = gl_primitive_type_from_d3d(shader->u.gs.output_type); + + GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); + checkGLcall("glBeginTransformFeedback"); + context->transform_feedback_active = 1; + } + if (context->use_immediate_mode_draw || emulation) draw_primitive_immediate_mode(context, state, stream_info, idx_data, idx_size, base_vertex_idx, start_idx, index_count, instance_count); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b846ae..dedde1e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4982,6 +4982,13 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + if (context->transform_feedback_active) + { + GL_EXTCALL(glEndTransformFeedback()); + checkGLcall("glEndTransformFeedback"); + context->transform_feedback_active = 0; + } + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { if (!(buffer = state->stream_output[i].buffer)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4bd38f6..2f90efd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1689,7 +1689,8 @@ struct wined3d_context DWORD update_compute_unordered_access_view_bindings : 1; DWORD uses_uavs : 1; DWORD destroy_delayed : 1; - DWORD padding : 9; + DWORD transform_feedback_active : 1; + DWORD padding : 8; DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask;

1 0

Józef Kucia : d3d11/tests: Add test for feature level 10 stream output descriptions.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: c8dc913c47b51de037a0b52d407f2473731621be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8dc913c47b51de037a0b52d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:20 2017 +0200 d3d11/tests: Add test for feature level 10 stream output descriptions. 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 | 258 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 258 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8dc913c47b51de037a0b…

1 0

Józef Kucia : d3d11/tests: Add test for stream output descriptions.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 90bfc6779ac839cee6881f9d2b859d9624d36f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bfc6779ac839cee6881f9d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:19 2017 +0200 d3d11/tests: Add test for stream output descriptions. 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 | 473 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 473 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90bfc6779ac839cee6881…

1 0

Józef Kucia : wined3d: Resume transform feedback after geometry shader switch.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: ac793e5503d1d9159bb4ca9fc4f255d23bda1c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac793e5503d1d9159bb4ca9fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:24 2017 +0200 wined3d: Resume transform feedback after geometry shader switch. 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 | 1 - dlls/wined3d/drawprim.c | 39 ++++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e7b5df..dbf8324 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16870,7 +16870,6 @@ static void test_stream_output_resume(void) for (j = 0; j < 6; ++j) /* 2 triangles */ { data = get_readback_vec4(&rb, idx++, 0); - todo_wine ok(compare_vec4(data, &constants[i], 0), "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u (%u, %u).\n", data->x, data->y, data->z, data->w, idx, i, j); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3611bf5..1335707 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -414,6 +414,27 @@ static BOOL use_transform_feedback(const struct wined3d_state *state) return shader->u.gs.so_desc.element_count; } +static void context_pause_transform_feedback(struct wined3d_context *context, BOOL force) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!context->transform_feedback_active || context->transform_feedback_paused) + return; + + if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) + { + GL_EXTCALL(glPauseTransformFeedback()); + checkGLcall("glPauseTransformFeedback"); + context->transform_feedback_paused = 1; + return; + } + + WARN("Cannot pause transform feedback operations.\n"); + + if (force) + context_end_transform_feedback(context); +} + /* Routine common to the draw primitive and draw indexed primitive routines */ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, @@ -447,8 +468,8 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } gl_info = context->gl_info; - if (context->transform_feedback_active && !use_transform_feedback(state)) - context_end_transform_feedback(context); + if (!use_transform_feedback(state)) + context_pause_transform_feedback(context, TRUE); for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -599,19 +620,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } - if (context->transform_feedback_active) - { - if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) - { - GL_EXTCALL(glPauseTransformFeedback()); - checkGLcall("glPauseTransformFeedback"); - context->transform_feedback_paused = 1; - } - else - { - WARN("Cannot pause transform feedback operations.\n"); - } - } + context_pause_transform_feedback(context, FALSE); if (rasterizer_discard) {

1 0

Jacek Caban : xmllite/tests: Added reader_namespace helper.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: a69aa5fc38a4a0d6788d337137aaacaec2346ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69aa5fc38a4a0d6788d33713… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:28 2017 +0200 xmllite/tests: Added reader_namespace helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9e27e9c..2da5d00 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -319,6 +319,20 @@ static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const char return str; } +#define reader_namespace(a,b) _reader_namespace(__LINE__,a,b) +static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const char *expect) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetNamespaceUri(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetNamespaceUri returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "namespace = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -2086,9 +2100,8 @@ static void test_namespaceuri(void) type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { - const WCHAR *uri, *local, *qname; + const WCHAR *local, *qname; UINT length, length2; - WCHAR *uriW; ok(type == XmlNodeType_Element || type == XmlNodeType_Text || @@ -2123,14 +2136,7 @@ static void test_namespaceuri(void) ok(length2 > 0, "Unexpected qualified name length\n"); } - uri = NULL; - hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); - ok(uri != NULL, "Unexpected NULL uri pointer\n"); - - uriW = a2w(uri_tests[i].uri[j]); - ok(!lstrcmpW(uriW, uri), "%s: uri %s\n", wine_dbgstr_w(local), wine_dbgstr_w(uri)); - free_str(uriW); + reader_namespace(reader, uri_tests[i].uri[j]); j++; }

1 0

Nikolay Sivov : dwrite: Simplify requested texture type validation in IDWriteGlyphRunAnalysis.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: a46b81a4785b8b394e6b62676147a25ff4d3b079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46b81a4785b8b394e6b62676… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 15:06:59 2017 +0300 dwrite: Simplify requested texture type validation in IDWriteGlyphRunAnalysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b3e2286..e50eda8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -167,6 +167,7 @@ struct dwrite_glyphrunanalysis { LONG ref; DWRITE_RENDERING_MODE1 rendering_mode; + DWRITE_TEXTURE_TYPE texture_type; /* derived from rendering mode specified on creation */ DWRITE_GLYPH_RUN run; /* glyphAdvances and glyphOffsets are not used */ DWRITE_MATRIX m; FLOAT ppdip; @@ -4874,8 +4875,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return E_INVALIDARG; } - if ((type == DWRITE_TEXTURE_ALIASED_1x1 && This->rendering_mode != DWRITE_RENDERING_MODE1_ALIASED) || - (type == DWRITE_TEXTURE_CLEARTYPE_3x1 && This->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED)) { + if (type != This->texture_type) { memset(bounds, 0, sizeof(*bounds)); return S_OK; } @@ -5059,24 +5059,9 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi if (size < required) return E_NOT_SUFFICIENT_BUFFER; - /* validate requested texture type with rendering mode */ - switch (This->rendering_mode) - { - case DWRITE_RENDERING_MODE1_ALIASED: - if (type != DWRITE_TEXTURE_ALIASED_1x1) - return DWRITE_E_UNSUPPORTEDOPERATION; - break; - case DWRITE_RENDERING_MODE1_GDI_CLASSIC: - case DWRITE_RENDERING_MODE1_GDI_NATURAL: - case DWRITE_RENDERING_MODE1_NATURAL: - case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC: - case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: - if (type != DWRITE_TEXTURE_CLEARTYPE_3x1) - return DWRITE_E_UNSUPPORTEDOPERATION; - break; - default: - ; - } + /* validate requested texture type */ + if (This->texture_type != type) + return DWRITE_E_UNSUPPORTEDOPERATION; memset(bitmap, 0, size); glyphrunanalysis_get_texturebounds(This, &runbounds); @@ -5197,6 +5182,12 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl; analysis->ref = 1; analysis->rendering_mode = desc->rendering_mode; + + if (desc->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED) + analysis->texture_type = DWRITE_TEXTURE_ALIASED_1x1; + else + analysis->texture_type = DWRITE_TEXTURE_CLEARTYPE_3x1; + analysis->flags = 0; analysis->bitmap = NULL; analysis->ppdip = desc->ppdip;

1 0

Nikolay Sivov : dwrite: Fix off by one error in glyph count adjustment.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 3d7fabf62788f6ea41e48d3daad05aa776d8bc1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7fabf62788f6ea41e48d3da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 15:07:02 2017 +0300 dwrite: Fix off by one error in glyph count adjustment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 5 ++--- dlls/dwrite/tests/layout.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index a7fff46..590b2c5 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1269,10 +1269,9 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const run->line = line; if (r->u.regular.run.glyphCount) { - /* trim from the left */ + /* Trim leading and trailing clusters. */ run->glyphcount = r->u.regular.run.glyphCount - r->u.regular.clustermap[start]; - /* trim from the right */ - if (start + length < r->u.regular.descr.stringLength - 1) + if (start + length < r->u.regular.descr.stringLength) run->glyphcount -= r->u.regular.run.glyphCount - r->u.regular.clustermap[start + length]; } else diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c097e20..daffd81 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1626,7 +1626,7 @@ static void test_Draw(void) flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", TRUE); + ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", FALSE); IDWriteTextLayout_Release(layout); /* with reduced width DrawGlyphRun() is called for every line */ @@ -4987,7 +4987,7 @@ todo_wine flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, drawunderline4_seq, "draw underline test 4", TRUE); + ok_sequence(sequences, RENDERER_ID, drawunderline4_seq, "draw underline test 4", FALSE); IDWriteTextLayout_Release(layout);

1 0