February 2019 - Wine-devel - list.winehq.org

[PATCH 5/6] wined3d: Remove unnecessary src_format NULL check from ffp_blit_supported().
by Józef Kucia 12 Feb '19

12 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0ee2f8266372..4d5b77702086 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1964,7 +1964,7 @@ static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) return FALSE; - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) { -- 2.19.2

3 2

[PATCH 3/6] wined3d: Factor out shader_get_stream_output_register_info().
by Józef Kucia 12 Feb '19

12 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 52 +++++++++------------------------- dlls/wined3d/shader.c | 37 +++++++++++++++++------- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 43 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4de0f82115df..970fa4b2b6d6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -822,9 +822,9 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri const char **varyings, unsigned int *varying_count, char *strings, unsigned int *strings_length, GLenum buffer_mode, struct wined3d_shader *shader) { - unsigned int i, component_idx, buffer_idx, count, length, highest_output_slot, stride; const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; - const struct wined3d_shader_signature_element *output; + unsigned int buffer_idx, count, length, highest_output_slot, stride; + unsigned int i, register_idx, component_idx; BOOL have_varyings_to_record = FALSE; count = length = 0; @@ -856,17 +856,9 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri continue; } - if (!(output = shader_find_signature_element(&shader->output_signature, - e->stream_idx, e->semantic_name, e->semantic_idx))) + if (!shader_get_stream_output_register_info(shader, e, &register_idx, &component_idx)) continue; - for (component_idx = 0; component_idx < 4; ++component_idx) - { - if ((1u << component_idx) & output->mask) - break; - } - component_idx += e->component_idx; - if (component_idx || e->component_count != 4) { if (so_desc->rasterizer_stream_idx != WINED3D_NO_RASTERIZER_STREAM) @@ -878,12 +870,12 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri } string_buffer_sprintf(buffer, "shader_in_out.reg%u_%u_%u", - output->register_idx, component_idx, component_idx + e->component_count - 1); + register_idx, component_idx, component_idx + e->component_count - 1); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } else { - string_buffer_sprintf(buffer, "shader_in_out.reg%u", output->register_idx); + string_buffer_sprintf(buffer, "shader_in_out.reg%u", register_idx); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } @@ -7437,8 +7429,7 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe const struct wined3d_shader *shader) { const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; - const struct wined3d_shader_signature_element *output; - unsigned int i, component_idx; + unsigned int i, register_idx, component_idx; shader_addline(buffer, "out shader_in_out\n{\n"); for (i = 0; i < so_desc->element_count; ++i) @@ -7452,17 +7443,9 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe } if (!e->semantic_name) continue; - if (!(output = shader_find_signature_element(&shader->output_signature, - e->stream_idx, e->semantic_name, e->semantic_idx))) + if (!shader_get_stream_output_register_info(shader, e, &register_idx, &component_idx)) continue; - for (component_idx = 0; component_idx < 4; ++component_idx) - { - if ((1u << component_idx) & output->mask) - break; - } - component_idx += e->component_idx; - if (component_idx || e->component_count != 4) { if (e->component_count == 1) @@ -7471,11 +7454,11 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe shader_addline(buffer, "vec%u", e->component_count); shader_addline(buffer, " reg%u_%u_%u;\n", - output->register_idx, component_idx, component_idx + e->component_count - 1); + register_idx, component_idx, component_idx + e->component_count - 1); } else { - shader_addline(buffer, "vec4 reg%u;\n", output->register_idx); + shader_addline(buffer, "vec4 reg%u;\n", register_idx); } } shader_addline(buffer, "} shader_out;\n"); @@ -7493,17 +7476,9 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe } if (!e->semantic_name) continue; - if (!(output = shader_find_signature_element(&shader->output_signature, - e->stream_idx, e->semantic_name, e->semantic_idx))) + if (!shader_get_stream_output_register_info(shader, e, &register_idx, &component_idx)) continue; - for (component_idx = 0; component_idx < 4; ++component_idx) - { - if ((1u << component_idx) & output->mask) - break; - } - component_idx += e->component_idx; - if (component_idx || e->component_count != 4) { DWORD write_mask; @@ -7512,13 +7487,12 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe write_mask = ((1u << e->component_count) - 1) << component_idx; shader_glsl_write_mask_to_str(write_mask, str_mask); shader_addline(buffer, "shader_out.reg%u_%u_%u = outputs[%u]%s;\n", - output->register_idx, component_idx, component_idx + e->component_count - 1, - output->register_idx, str_mask); + register_idx, component_idx, component_idx + e->component_count - 1, + register_idx, str_mask); } else { - shader_addline(buffer, "shader_out.reg%u = outputs[%u];\n", - output->register_idx, output->register_idx); + shader_addline(buffer, "shader_out.reg%u = outputs[%u];\n", register_idx, register_idx); } } shader_addline(buffer, "}\n"); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a7d0e6911901..b75ff6f99ce7 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3728,7 +3728,7 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; } -struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, +static struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, unsigned int stream_idx, const char *semantic_name, unsigned int semantic_idx) { struct wined3d_shader_signature_element *e = s->elements; @@ -3745,14 +3745,36 @@ struct wined3d_shader_signature_element *shader_find_signature_element(const str return NULL; } +BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, + const struct wined3d_stream_output_element *so_element, unsigned int *register_idx, unsigned int *component_idx) +{ + const struct wined3d_shader_signature_element *output; + unsigned int idx; + + if (!(output = shader_find_signature_element(&shader->output_signature, + so_element->stream_idx, so_element->semantic_name, so_element->semantic_idx))) + return FALSE; + + for (idx = 0; idx < 4; ++idx) + { + if (output->mask & (1u << idx)) + break; + } + idx += so_element->component_idx; + + *register_idx = output->register_idx; + *component_idx = idx; + return TRUE; +} + static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, const struct wined3d_stream_output_desc *so_desc) { const struct wined3d_shader_frontend *fe = shader->frontend; const struct wined3d_shader_signature_element *output; + unsigned int i, component_idx, register_idx, mask; struct wined3d_stream_output_element *elements; struct wined3d_shader_version shader_version; - unsigned int i, component_idx, mask; const DWORD *ptr; void *fe_data; HRESULT hr; @@ -3805,7 +3827,8 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, if (!e->semantic_name) continue; if (!(output = shader_find_signature_element(&shader->output_signature, - e->stream_idx, e->semantic_name, e->semantic_idx))) + e->stream_idx, e->semantic_name, e->semantic_idx)) + || !shader_get_stream_output_register_info(shader, e, &register_idx, &component_idx)) { WARN("Failed to find output signature element for stream output entry.\n"); return E_INVALIDARG; @@ -3813,17 +3836,11 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, e->semantic_name = output->semantic_name; - for (component_idx = 0; component_idx < 4; ++component_idx) - { - if ((1u << component_idx) & output->mask) - break; - } - component_idx += e->component_idx; mask = ((1u << e->component_count) - 1) << component_idx; if ((output->mask & 0xff & mask) != mask) { WARN("Invalid component range %u-%u (mask %#x), output mask %#x.\n", - e->component_idx, e->component_count, mask, output->mask & 0xff); + component_idx, e->component_count, mask, output->mask & 0xff); return E_INVALIDARG; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 187c9e18c523..6aadc316f68e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1267,8 +1267,9 @@ extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, unsigned int max_shader_version, enum wined3d_shader_byte_code_format *format) DECLSPEC_HIDDEN; -struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, - unsigned int stream_idx, const char *semantic_name, unsigned int semantic_idx) DECLSPEC_HIDDEN; +BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, + const struct wined3d_stream_output_element *so_element, unsigned int *register_idx, + unsigned int *component_idx) DECLSPEC_HIDDEN; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); -- 2.19.2

3 2

[PATCH 4/6] wined3d: Remove unnecessary src_format NULL check from arbfp_blit_supported().
by Józef Kucia 12 Feb '19

12 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 37ec7e9093d6..6b6df16b8356 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7714,7 +7714,7 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine return FALSE; } - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; -- 2.19.2

3 2

[PATCH 2/6] wined3d: Keep original component index in stream output elements.
by Józef Kucia 12 Feb '19

12 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 83 +++++++++++++++++++++++----------- dlls/wined3d/shader.c | 18 +++----- dlls/wined3d/wined3d_private.h | 5 +- 3 files changed, 66 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba2c62165b53..4de0f82115df 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -819,11 +819,12 @@ static void append_transform_feedback_skip_components(const char **varyings, } static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_string_buffer *buffer, - const char **varyings, unsigned int *varying_count, - char *strings, unsigned int *strings_length, GLenum buffer_mode, - const struct wined3d_stream_output_desc *so_desc, const unsigned int *output_register_idx) + const char **varyings, unsigned int *varying_count, char *strings, unsigned int *strings_length, + GLenum buffer_mode, struct wined3d_shader *shader) { - unsigned int i, buffer_idx, count, length, highest_output_slot, stride; + unsigned int i, component_idx, buffer_idx, count, length, highest_output_slot, stride; + const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; + const struct wined3d_shader_signature_element *output; BOOL have_varyings_to_record = FALSE; count = length = 0; @@ -855,23 +856,34 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri continue; } - if (e->component_idx || e->component_count != 4) + if (!(output = shader_find_signature_element(&shader->output_signature, + e->stream_idx, e->semantic_name, e->semantic_idx))) + continue; + + for (component_idx = 0; component_idx < 4; ++component_idx) + { + if ((1u << component_idx) & output->mask) + break; + } + component_idx += e->component_idx; + + if (component_idx || e->component_count != 4) { if (so_desc->rasterizer_stream_idx != WINED3D_NO_RASTERIZER_STREAM) { - FIXME("Unsupported component range %u-%u.\n", e->component_idx, e->component_count); + FIXME("Unsupported component range %u-%u.\n", component_idx, e->component_count); append_transform_feedback_skip_components(varyings, &count, &strings, &length, buffer, e->component_count); continue; } string_buffer_sprintf(buffer, "shader_in_out.reg%u_%u_%u", - output_register_idx[i], e->component_idx, e->component_idx + e->component_count - 1); + output->register_idx, component_idx, component_idx + e->component_count - 1); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } else { - string_buffer_sprintf(buffer, "shader_in_out.reg%u", output_register_idx[i]); + string_buffer_sprintf(buffer, "shader_in_out.reg%u", output->register_idx); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } @@ -907,7 +919,6 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { - const unsigned int *output_register_idx = shader->u.gs.output_register_idx; const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_string_buffer *buffer; @@ -962,7 +973,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co buffer = string_buffer_get(&priv->string_buffers); - if (!shader_glsl_generate_transform_feedback_varyings(buffer, NULL, &count, NULL, &length, mode, so_desc, output_register_idx)) + if (!shader_glsl_generate_transform_feedback_varyings(buffer, NULL, &count, NULL, &length, mode, shader)) { FIXME("No varyings to record, disabling transform feedback.\n"); shader->u.gs.so_desc.element_count = 0; @@ -984,7 +995,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co return; } - shader_glsl_generate_transform_feedback_varyings(buffer, varyings, NULL, strings, NULL, mode, so_desc, output_register_idx); + shader_glsl_generate_transform_feedback_varyings(buffer, varyings, NULL, strings, NULL, mode, shader); GL_EXTCALL(glTransformFeedbackVaryings(program_id, count, varyings, mode)); checkGLcall("glTransformFeedbackVaryings"); @@ -7422,12 +7433,12 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl return ret; } -static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *priv, - const struct wined3d_shader *shader, const struct wined3d_stream_output_desc *so_desc, - const unsigned int *output_register_idx) +static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffer *buffer, + const struct wined3d_shader *shader) { - struct wined3d_string_buffer *buffer = &priv->shader_buffer; - unsigned int i; + const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; + const struct wined3d_shader_signature_element *output; + unsigned int i, component_idx; shader_addline(buffer, "out shader_in_out\n{\n"); for (i = 0; i < so_desc->element_count; ++i) @@ -7441,19 +7452,30 @@ static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *pr } if (!e->semantic_name) continue; + if (!(output = shader_find_signature_element(&shader->output_signature, + e->stream_idx, e->semantic_name, e->semantic_idx))) + continue; + + for (component_idx = 0; component_idx < 4; ++component_idx) + { + if ((1u << component_idx) & output->mask) + break; + } + component_idx += e->component_idx; - if (e->component_idx || e->component_count != 4) + if (component_idx || e->component_count != 4) { if (e->component_count == 1) shader_addline(buffer, "float"); else shader_addline(buffer, "vec%u", e->component_count); + shader_addline(buffer, " reg%u_%u_%u;\n", - output_register_idx[i], e->component_idx, e->component_idx + e->component_count - 1); + output->register_idx, component_idx, component_idx + e->component_count - 1); } else { - shader_addline(buffer, "vec4 reg%u;\n", output_register_idx[i]); + shader_addline(buffer, "vec4 reg%u;\n", output->register_idx); } } shader_addline(buffer, "} shader_out;\n"); @@ -7471,22 +7493,32 @@ static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *pr } if (!e->semantic_name) continue; + if (!(output = shader_find_signature_element(&shader->output_signature, + e->stream_idx, e->semantic_name, e->semantic_idx))) + continue; + + for (component_idx = 0; component_idx < 4; ++component_idx) + { + if ((1u << component_idx) & output->mask) + break; + } + component_idx += e->component_idx; - if (e->component_idx || e->component_count != 4) + if (component_idx || e->component_count != 4) { DWORD write_mask; char str_mask[6]; - write_mask = ((1u << e->component_count) - 1) << e->component_idx; + write_mask = ((1u << e->component_count) - 1) << component_idx; shader_glsl_write_mask_to_str(write_mask, str_mask); shader_addline(buffer, "shader_out.reg%u_%u_%u = outputs[%u]%s;\n", - output_register_idx[i], e->component_idx, e->component_idx + e->component_count - 1, - output_register_idx[i], str_mask); + output->register_idx, component_idx, component_idx + e->component_count - 1, + output->register_idx, str_mask); } else { shader_addline(buffer, "shader_out.reg%u = outputs[%u];\n", - output_register_idx[i], output_register_idx[i]); + output->register_idx, output->register_idx); } } shader_addline(buffer, "}\n"); @@ -8532,8 +8564,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context if (is_rasterization_disabled(shader)) { - shader_glsl_generate_stream_output_setup(priv, shader, - &shader->u.gs.so_desc, shader->u.gs.output_register_idx); + shader_glsl_generate_stream_output_setup(buffer, shader); } else { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a52b9a1c83a9..a7d0e6911901 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3145,7 +3145,6 @@ static void shader_cleanup(struct wined3d_shader *shader) else if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) { heap_free((void *)shader->u.gs.so_desc.elements); - heap_free(shader->u.gs.output_register_idx); } heap_free(shader->patch_constant_signature.elements); @@ -3729,7 +3728,7 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_ return WINED3D_OK; } -static struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, +struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, unsigned int stream_idx, const char *semantic_name, unsigned int semantic_idx) { struct wined3d_shader_signature_element *e = s->elements; @@ -3753,7 +3752,7 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, const struct wined3d_shader_signature_element *output; struct wined3d_stream_output_element *elements; struct wined3d_shader_version shader_version; - unsigned int i, j, mask; + unsigned int i, component_idx, mask; const DWORD *ptr; void *fe_data; HRESULT hr; @@ -3792,9 +3791,6 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, return hr; } - if (!(shader->u.gs.output_register_idx = heap_calloc(so_desc->element_count, sizeof(*shader->u.gs.output_register_idx)))) - return E_OUTOFMEMORY; - if (!(elements = heap_calloc(so_desc->element_count, sizeof(*elements)))) return E_OUTOFMEMORY; @@ -3816,16 +3812,14 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, } e->semantic_name = output->semantic_name; - shader->u.gs.output_register_idx[i] = output->register_idx; - for (j = 0; j < 4; ++j) + for (component_idx = 0; component_idx < 4; ++component_idx) { - if ((1u << j) & output->mask) + if ((1u << component_idx) & output->mask) break; } - e->component_idx += j; - - mask = ((1u << e->component_count) - 1) << e->component_idx; + component_idx += e->component_idx; + mask = ((1u << e->component_count) - 1) << component_idx; if ((output->mask & 0xff & mask) != mask) { WARN("Invalid component range %u-%u (mask %#x), output mask %#x.\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07d77011f1d5..187c9e18c523 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1266,7 +1266,9 @@ extern const struct wined3d_shader_frontend sm1_shader_frontend DECLSPEC_HIDDEN; extern const struct wined3d_shader_frontend sm4_shader_frontend DECLSPEC_HIDDEN; HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, - unsigned int max_shader_version, enum wined3d_shader_byte_code_format *format); + unsigned int max_shader_version, enum wined3d_shader_byte_code_format *format) DECLSPEC_HIDDEN; +struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, + unsigned int stream_idx, const char *semantic_name, unsigned int semantic_idx) DECLSPEC_HIDDEN; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); @@ -4198,7 +4200,6 @@ struct wined3d_geometry_shader unsigned int instance_count; struct wined3d_stream_output_desc so_desc; - unsigned int *output_register_idx; }; struct wined3d_pixel_shader -- 2.19.2

3 2

[PATCH 1/6] wined3d: Export wined3d_extract_shader_input_signature_from_dxbc().
by Józef Kucia 12 Feb '19

12 Feb '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 22 -------- dlls/d3d11/inputlayout.c | 28 +++++----- dlls/d3d11/shader.c | 104 ------------------------------------- dlls/d3d11/utils.c | 83 ----------------------------- dlls/wined3d/shader_sm4.c | 23 ++++++++ dlls/wined3d/wined3d.spec | 2 + include/wine/wined3d.h | 3 ++ 7 files changed, 42 insertions(+), 223 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 580f520aae9c..44e774b8b4df 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -102,22 +102,6 @@ static inline UINT d3d11_bind_flags_from_wined3d(unsigned int bind_flags) return bind_flags; } -static inline void read_dword(const char **ptr, DWORD *d) -{ - memcpy(d, *ptr, sizeof(*d)); - *ptr += sizeof(*d); -} - -static inline BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) -{ - return !count || (data_size - offset) / count >= size; -} - -void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; - -HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; - /* ID3D11Texture1D, ID3D10Texture1D */ struct d3d_texture1d { @@ -391,12 +375,6 @@ HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_ struct d3d11_compute_shader **shader) DECLSPEC_HIDDEN; struct d3d11_compute_shader *unsafe_impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) DECLSPEC_HIDDEN; -HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_size, - struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; -struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, - const char *semantic_name, unsigned int semantic_idx, unsigned int stream_idx) DECLSPEC_HIDDEN; -void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; - /* ID3D11ClassLinkage */ struct d3d11_class_linkage { diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index a650ca77f5eb..127ea2994797 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -24,19 +24,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) +static struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, + const char *semantic_name, unsigned int semantic_idx, unsigned int stream_idx) { - struct wined3d_shader_signature *is = ctx; - - if (tag != TAG_ISGN) - return S_OK; + struct wined3d_shader_signature_element *e = s->elements; + unsigned int i; - if (is->elements) + for (i = 0; i < s->element_count; ++i) { - FIXME("Multiple input signatures.\n"); - shader_free_signature(is); + if (!strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx + && e[i].stream_idx == stream_idx) + return &e[i]; } - return shader_parse_signature(tag, data, data_size, is); + + return NULL; } static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEMENT_DESC *element_descs, @@ -47,17 +48,16 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME unsigned int i; HRESULT hr; - memset(&is, 0, sizeof(is)); - if (FAILED(hr = parse_dxbc(shader_byte_code, shader_byte_code_length, isgn_handler, &is))) + if (FAILED(hr = wined3d_extract_shader_input_signature_from_dxbc(&is, shader_byte_code, shader_byte_code_length))) { - ERR("Failed to parse input signature.\n"); + ERR("Failed to extract input signature.\n"); return E_FAIL; } if (!(*wined3d_elements = heap_calloc(element_count, sizeof(**wined3d_elements)))) { ERR("Failed to allocate wined3d vertex element array memory.\n"); - shader_free_signature(&is); + heap_free(is.elements); return E_OUTOFMEMORY; } @@ -83,7 +83,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME WARN("Unused input element %u.\n", i); } - shader_free_signature(&is); + heap_free(is.elements); return S_OK; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 259ac331dbfe..9a4f1a87b1a5 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -24,110 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) -{ - size_t len, max_len; - - if (offset >= data_size) - { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); - return NULL; - } - - max_len = data_size - offset; - len = strnlen(data + offset, max_len); - - if (len == max_len) - return NULL; - - return data + offset; -} - -HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_size, - struct wined3d_shader_signature *s) -{ - struct wined3d_shader_signature_element *e; - const char *ptr = data; - unsigned int i; - DWORD count; - - if (!require_space(0, 2, sizeof(DWORD), data_size)) - { - WARN("Invalid data size %#x.\n", data_size); - return E_INVALIDARG; - } - - read_dword(&ptr, &count); - TRACE("%u elements.\n", count); - - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000008. */ - - if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) - { - WARN("Invalid count %#x (data size %#x).\n", count, data_size); - return E_INVALIDARG; - } - - if (!(e = heap_calloc(count, sizeof(*e)))) - { - ERR("Failed to allocate input signature memory.\n"); - return E_OUTOFMEMORY; - } - - for (i = 0; i < count; ++i) - { - DWORD name_offset; - - if (tag == TAG_OSG5) - read_dword(&ptr, &e[i].stream_idx); - else - e[i].stream_idx = 0; - read_dword(&ptr, &name_offset); - if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) - { - WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); - heap_free(e); - return E_INVALIDARG; - } - read_dword(&ptr, &e[i].semantic_idx); - read_dword(&ptr, &e[i].sysval_semantic); - read_dword(&ptr, &e[i].component_type); - read_dword(&ptr, &e[i].register_idx); - read_dword(&ptr, &e[i].mask); - - TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " - "type %u, register idx: %u, use_mask %#x, input_mask %#x.\n", - e[i].stream_idx, debugstr_a(e[i].semantic_name), e[i].semantic_idx, e[i].sysval_semantic, - e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); - } - - s->elements = e; - s->element_count = count; - - return S_OK; -} - -struct wined3d_shader_signature_element *shader_find_signature_element(const struct wined3d_shader_signature *s, - const char *semantic_name, unsigned int semantic_idx, unsigned int stream_idx) -{ - struct wined3d_shader_signature_element *e = s->elements; - unsigned int i; - - for (i = 0; i < s->element_count; ++i) - { - if (!strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx - && e[i].stream_idx == stream_idx) - return &e[i]; - } - - return NULL; -} - -void shader_free_signature(struct wined3d_shader_signature *s) -{ - heap_free(s->elements); -} - /* ID3D11VertexShader methods */ static inline struct d3d_vertex_shader *impl_from_ID3D11VertexShader(ID3D11VertexShader *iface) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index cf40cc47effb..0555603eefa4 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -871,86 +871,3 @@ HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, return hr; } - -void skip_dword_unknown(const char **ptr, unsigned int count) -{ - unsigned int i; - DWORD d; - - WARN("Skipping %u unknown DWORDs:\n", count); - for (i = 0; i < count; ++i) - { - read_dword(ptr, &d); - WARN("\t0x%08x\n", d); - } -} - -HRESULT parse_dxbc(const char *data, SIZE_T data_size, - HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) -{ - const char *ptr = data; - HRESULT hr = S_OK; - DWORD chunk_count; - DWORD total_size; - unsigned int i; - DWORD version; - DWORD tag; - - read_dword(&ptr, &tag); - TRACE("tag: %s.\n", debugstr_an((const char *)&tag, 4)); - - if (tag != TAG_DXBC) - { - WARN("Wrong tag.\n"); - return E_INVALIDARG; - } - - WARN("Ignoring DXBC checksum.\n"); - skip_dword_unknown(&ptr, 4); - - read_dword(&ptr, &version); - TRACE("version: %#x.\n", version); - if (version != 0x00000001) - { - WARN("Got unexpected DXBC version %#x.\n", version); - return E_INVALIDARG; - } - - read_dword(&ptr, &total_size); - TRACE("total size: %#x\n", total_size); - - read_dword(&ptr, &chunk_count); - TRACE("chunk count: %#x\n", chunk_count); - - for (i = 0; i < chunk_count; ++i) - { - DWORD chunk_tag, chunk_size; - const char *chunk_ptr; - DWORD chunk_offset; - - read_dword(&ptr, &chunk_offset); - TRACE("chunk %u at offset %#x\n", i, chunk_offset); - - if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) - { - WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); - return E_FAIL; - } - - chunk_ptr = data + chunk_offset; - - read_dword(&chunk_ptr, &chunk_tag); - read_dword(&chunk_ptr, &chunk_size); - - if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) - { - WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); - return E_FAIL; - } - - hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); - if (FAILED(hr)) break; - } - - return hr; -} diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5f9dbecfebaa..db3297e8e993 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -2103,3 +2103,26 @@ HRESULT shader_extract_from_dxbc(struct wined3d_shader *shader, return hr; } + +static HRESULT shader_isgn_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) +{ + struct wined3d_shader_signature *is = ctx; + + if (tag != TAG_ISGN) + return S_OK; + + if (is->elements) + { + FIXME("Multiple shader signatures.\n"); + return S_OK; + } + + return shader_parse_signature(tag, data, data_size, is); +} + +HRESULT CDECL wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, + const void *code, SIZE_T code_size) +{ + memset(signature, 0, sizeof(*signature)); + return parse_dxbc(code, code_size, shader_isgn_chunk_handler, signature); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b1d3a521de7b..75b9fe12c600 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -315,3 +315,5 @@ @ cdecl wined3d_vertex_declaration_decref(ptr) @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) + +@ cdecl wined3d_extract_shader_input_signature_from_dxbc(ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a58dd87ee7d0..07329024fefb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2750,6 +2750,9 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); +HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, + const void *byte_code, SIZE_T byte_code_size); + /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) { -- 2.19.2

3 2

[PATCH] ddraw/tests: Destroy viewport in test_lighting_interface_versions() (Valgrind).
by Józef Kucia 12 Feb '19

12 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36381 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3dda289ad1fc..fced3d943a9a 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3996,6 +3996,7 @@ static void test_lighting_interface_versions(void) destroy_material(background); destroy_material(emissive); + destroy_viewport(device, viewport); IDirectDrawSurface_Release(rt); IDirect3DDevice2_Release(device); ref = IDirectDraw2_Release(ddraw); -- 2.19.2

3 2

[PATCH] d2d1: Add ID2D1GeometryGroup stub.
by Nikolay Sivov 12 Feb '19

12 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46611 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 8 ++ dlls/d2d1/factory.c | 20 ++- dlls/d2d1/geometry.c | 264 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 289 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 5f451b22d9..70b841df8c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -485,6 +485,12 @@ struct d2d_geometry ID2D1Geometry *src_geometry; D2D_MATRIX_3X2_F transform; } transformed; + struct + { + ID2D1Geometry **src_geometries; + UINT32 geometry_count; + D2D1_FILL_MODE fill_mode; + } group; } u; }; @@ -493,6 +499,8 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN; void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory, ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; +HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *factory, + D2D1_FILL_MODE fill_mode, ID2D1Geometry **src_geometries, unsigned int geometry_count) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; struct d2d_device diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index d48673cd85..c2a0405abd 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -173,10 +173,26 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory2 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory2 *iface, D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, UINT32 geometry_count, ID2D1GeometryGroup **group) { - FIXME("iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p stub!\n", + struct d2d_geometry *object; + HRESULT hr; + + TRACE("iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p.\n", iface, fill_mode, geometries, geometry_count, group); - return E_NOTIMPL; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d2d_geometry_group_init(object, (ID2D1Factory *)iface, fill_mode, geometries, geometry_count))) + { + WARN("Failed to initialize geometry group, hr %#x.\n", hr); + heap_free(object); + return hr; + } + + TRACE("Created geometry group %p.\n", object); + *group = (ID2D1GeometryGroup *)&object->ID2D1Geometry_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory2 *iface, diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 421ba2b551..21fb854cd6 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -4113,12 +4113,274 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * geometry->outline = src_impl->outline; } +static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1GeometryGroup) + || IsEqualGUID(iid, &IID_ID2D1Geometry) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1GeometryGroup_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_geometry_group_AddRef(ID2D1GeometryGroup *iface) +{ + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + ULONG refcount = InterlockedIncrement(&geometry->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_geometry_group_Release(ID2D1GeometryGroup *iface) +{ + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + ULONG refcount = InterlockedDecrement(&geometry->refcount); + unsigned int i; + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + for (i = 0; i < geometry->u.group.geometry_count; ++i) + ID2D1Geometry_Release(geometry->u.group.src_geometries[i]); + d2d_geometry_cleanup(geometry); + heap_free(geometry); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_geometry_group_GetFactory(ID2D1GeometryGroup *iface, + ID2D1Factory **factory) +{ + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = geometry->factory); +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetBounds(ID2D1GeometryGroup *iface, + const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds) +{ + FIXME("iface %p, transform %p, bounds %p stub!.\n", iface, transform, bounds); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_GetWidenedBounds(ID2D1GeometryGroup *iface, + float stroke_width, ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, + float tolerance, D2D1_RECT_F *bounds) +{ + FIXME("iface %p, stroke_width %.8e, stroke_style %p, transform %p, tolerance %.8e, bounds %p stub!\n", + iface, stroke_width, stroke_style, transform, tolerance, bounds); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_StrokeContainsPoint(ID2D1GeometryGroup *iface, + D2D1_POINT_2F point, float stroke_width, ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, + float tolerance, BOOL *contains) +{ + FIXME("iface %p, point %s, stroke_width %.8e, stroke_style %p, transform %p, tolerance %.8e, contains %p.\n", + iface, debug_d2d_point_2f(&point), stroke_width, stroke_style, transform, tolerance, contains); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_FillContainsPoint(ID2D1GeometryGroup *iface, + D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains) +{ + FIXME("iface %p, point %s, transform %p, tolerance %.8e, contains %p stub!.\n", + iface, debug_d2d_point_2f(&point), transform, tolerance, contains); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_CompareWithGeometry(ID2D1GeometryGroup *iface, + ID2D1Geometry *geometry, const D2D1_MATRIX_3X2_F *transform, float tolerance, D2D1_GEOMETRY_RELATION *relation) +{ + FIXME("iface %p, geometry %p, transform %p, tolerance %.8e, relation %p stub!\n", + iface, geometry, transform, tolerance, relation); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_Simplify(ID2D1GeometryGroup *iface, + D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, const D2D1_MATRIX_3X2_F *transform, float tolerance, + ID2D1SimplifiedGeometrySink *sink) +{ + FIXME("iface %p, option %#x, transform %p, tolerance %.8e, sink %p stub!.\n", + iface, option, transform, tolerance, sink); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_Tessellate(ID2D1GeometryGroup *iface, + const D2D1_MATRIX_3X2_F *transform, float tolerance, ID2D1TessellationSink *sink) +{ + FIXME("iface %p, transform %p, tolerance %.8e, sink %p stub!\n", iface, transform, tolerance, sink); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_CombineWithGeometry(ID2D1GeometryGroup *iface, + ID2D1Geometry *geometry, D2D1_COMBINE_MODE combine_mode, const D2D1_MATRIX_3X2_F *transform, + float tolerance, ID2D1SimplifiedGeometrySink *sink) +{ + FIXME("iface %p, geometry %p, combine_mode %#x, transform %p, tolerance %.8e, sink %p stub!\n", + iface, geometry, combine_mode, transform, tolerance, sink); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_Outline(ID2D1GeometryGroup *iface, + const D2D1_MATRIX_3X2_F *transform, float tolerance, ID2D1SimplifiedGeometrySink *sink) +{ + FIXME("iface %p, transform %p, tolerance %.8e, sink %p stub!\n", iface, transform, tolerance, sink); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_ComputeArea(ID2D1GeometryGroup *iface, + const D2D1_MATRIX_3X2_F *transform, float tolerance, float *area) +{ + FIXME("iface %p, transform %p, tolerance %.8e, area %p stub!\n", iface, transform, tolerance, area); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_ComputeLength(ID2D1GeometryGroup *iface, + const D2D1_MATRIX_3X2_F *transform, float tolerance, float *length) +{ + FIXME("iface %p, transform %p, tolerance %.8e, length %p stub!\n", iface, transform, tolerance, length); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_ComputePointAtLength(ID2D1GeometryGroup *iface, + float length, const D2D1_MATRIX_3X2_F *transform, float tolerance, D2D1_POINT_2F *point, + D2D1_POINT_2F *tangent) +{ + FIXME("iface %p, length %.8e, transform %p, tolerance %.8e, point %p, tangent %p stub!\n", + iface, length, transform, tolerance, point, tangent); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_geometry_group_Widen(ID2D1GeometryGroup *iface, float stroke_width, + ID2D1StrokeStyle *stroke_style, const D2D1_MATRIX_3X2_F *transform, float tolerance, + ID2D1SimplifiedGeometrySink *sink) +{ + FIXME("iface %p, stroke_width %.8e, stroke_style %p, transform %p, tolerance %.8e, sink %p stub!\n", + iface, stroke_width, stroke_style, transform, tolerance, sink); + + return E_NOTIMPL; +} + +static D2D1_FILL_MODE STDMETHODCALLTYPE d2d_geometry_group_GetFillMode(ID2D1GeometryGroup *iface) +{ + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + + TRACE("iface %p.\n", iface); + + return geometry->u.group.fill_mode; +} + +static UINT32 STDMETHODCALLTYPE d2d_geometry_group_GetSourceGeometryCount(ID2D1GeometryGroup *iface) +{ + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + + TRACE("iface %p.\n", iface); + + return geometry->u.group.geometry_count; +} + +static void STDMETHODCALLTYPE d2d_geometry_group_GetSourceGeometries(ID2D1GeometryGroup *iface, + ID2D1Geometry **geometries, UINT32 geometry_count) +{ + struct d2d_geometry *geometry = impl_from_ID2D1GeometryGroup(iface); + unsigned int i; + + TRACE("iface %p, geometries %p, geometry_count %u.\n", iface, geometries, geometry_count); + + geometry_count = min(geometry_count, geometry->u.group.geometry_count); + for (i = 0; i < geometry_count; ++i) + ID2D1Geometry_AddRef(geometries[i] = geometry->u.group.src_geometries[i]); +} + +static const struct ID2D1GeometryGroupVtbl d2d_geometry_group_vtbl = +{ + d2d_geometry_group_QueryInterface, + d2d_geometry_group_AddRef, + d2d_geometry_group_Release, + d2d_geometry_group_GetFactory, + d2d_geometry_group_GetBounds, + d2d_geometry_group_GetWidenedBounds, + d2d_geometry_group_StrokeContainsPoint, + d2d_geometry_group_FillContainsPoint, + d2d_geometry_group_CompareWithGeometry, + d2d_geometry_group_Simplify, + d2d_geometry_group_Tessellate, + d2d_geometry_group_CombineWithGeometry, + d2d_geometry_group_Outline, + d2d_geometry_group_ComputeArea, + d2d_geometry_group_ComputeLength, + d2d_geometry_group_ComputePointAtLength, + d2d_geometry_group_Widen, + d2d_geometry_group_GetFillMode, + d2d_geometry_group_GetSourceGeometryCount, + d2d_geometry_group_GetSourceGeometries, +}; + +HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *factory, + D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, unsigned int geometry_count) +{ + unsigned int i; + + d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_geometry_group_vtbl); + + if (!(geometry->u.group.src_geometries = heap_alloc(geometry_count * sizeof(*geometries)))) + { + d2d_geometry_cleanup(geometry); + return E_OUTOFMEMORY; + } + + for (i = 0; i < geometry_count; ++i) + { + ID2D1Geometry_AddRef(geometry->u.group.src_geometries[i] = geometries[i]); + } + geometry->u.group.geometry_count = geometry_count; + geometry->u.group.fill_mode = fill_mode; + + return S_OK; +} + struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) { if (!iface) return NULL; assert(iface->lpVtbl == (const ID2D1GeometryVtbl *)&d2d_path_geometry_vtbl || iface->lpVtbl == (const ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl - || iface->lpVtbl == (const ID2D1GeometryVtbl *)&d2d_transformed_geometry_vtbl); + || iface->lpVtbl == (const ID2D1GeometryVtbl *)&d2d_transformed_geometry_vtbl + || iface->lpVtbl == (const ID2D1GeometryVtbl *)&d2d_geometry_group_vtbl); return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface); } -- 2.20.1

2 1

[PATCH] gdi32: Use the gasp table setting when lfQuality is ANTIALIASED_QUALITY.
by Byeongsik Jeon 12 Feb '19

12 Feb '19

I'm not sure why this didn't apply. The actual test results are obvious. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8d151ab397..71a40feff2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5936,13 +5936,14 @@ done: switch (lf.lfQuality) { case NONANTIALIASED_QUALITY: - case ANTIALIASED_QUALITY: next->funcs->pSelectFont( dev, hfont, aa_flags ); break; case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: default: if (!*aa_flags) *aa_flags = ret->aa_flags; + /* fall through */ + case ANTIALIASED_QUALITY: next->funcs->pSelectFont( dev, hfont, aa_flags ); /* fixup the antialiasing flags for that font */ -- 2.20.1

1 0

[PATCH] dsound: IDirectSoundNotify is only available when DSBCAPS_CTRLPOSITIONNOTIFY is specified.
by Alistair Leslie-Hughes 12 Feb '19

12 Feb '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45473 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 16 +++++++++++----- dlls/dsound/tests/dsound.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5262628..e54ba57 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -923,11 +923,17 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface(IDirectSoundBuffer8 return S_OK; } - if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { - IDirectSoundNotify_AddRef(&This->IDirectSoundNotify_iface); - *ppobj = &This->IDirectSoundNotify_iface; - return S_OK; - } + if ( IsEqualGUID( &IID_IDirectSoundNotify, riid ) ) { + if(This->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY) + { + IDirectSoundNotify_AddRef(&This->IDirectSoundNotify_iface); + *ppobj = &This->IDirectSoundNotify_iface; + return S_OK; + } + + TRACE( "App requested IDirectSoundNotify without DSBCAPS_CTRLPOSITIONNOTIFY flag.\n"); + return E_NOINTERFACE; + } if ( IsEqualGUID( &IID_IDirectSound3DBuffer, riid ) ) { if(This->dsbd.dwFlags & DSBCAPS_CTRL3D){ diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 89f0aa0..5818ca1 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1607,6 +1607,52 @@ static void test_notifications(LPGUID lpGuid) IDirectSound_Release(dso); } +static void test_notifications_interface(LPGUID lpGuid) +{ + HRESULT rc; + IDirectSound *dso; + IDirectSoundBuffer *buf; + IDirectSoundNotify *notify; + DSBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + + rc = pDirectSoundCreate(lpGuid, &dso, NULL); + ok(rc == DS_OK || rc == DSERR_NODRIVER || rc == DSERR_ALLOCATED, + "DirectSoundCreate() failed: %08x\n", rc); + if(rc != DS_OK) + return; + + rc = IDirectSound_SetCooperativeLevel(dso, get_hwnd(), DSSCL_PRIORITY); + ok(rc == DS_OK, "IDirectSound_SetCooperativeLevel() failed: %08x\n", rc); + if(rc != DS_OK){ + IDirectSound_Release(dso); + return; + } + + wfx.wFormatTag = WAVE_FORMAT_PCM; + wfx.nChannels = 1; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + wfx.cbSize = 0; + + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2; + bufdesc.dwBufferBytes = wfx.nSamplesPerSec * wfx.nBlockAlign / 2; /* 0.5s */ + bufdesc.lpwfxFormat = &wfx; + rc = IDirectSound_CreateSoundBuffer(dso, &bufdesc, &buf, NULL); + ok(rc == DS_OK && buf != NULL, "IDirectSound_CreateSoundBuffer() failed " + "to create a buffer %08x\n", rc); + + rc = IDirectSoundBuffer_QueryInterface(buf, &IID_IDirectSoundNotify, (void**)&notify); + ok(rc == E_NOINTERFACE, "QueryInterface(IID_IDirectSoundNotify): %08x\n", rc); + + IDirectSoundBuffer_Release(buf); + IDirectSound_Release(dso); +} + static unsigned int number; static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, @@ -1638,6 +1684,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, test_duplicate(lpGuid); test_invalid_fmts(lpGuid); test_notifications(lpGuid); + test_notifications_interface(lpGuid); } return TRUE; -- 1.9.1

2 1

[PATCH] gdi32: Add the workaround for Freetype<2.8.1 v40 FT_LOAD_TARGET_MONO issue.
by Byeongsik Jeon 12 Feb '19

12 Feb '19

Freetype<2.8.1 v40 has the wrong advance width issue and wrong rendering issue. This workaround is required for the Linux distribution that contains the old version of Freetype. I was trying to submit it together because it was related to other FreeType issues. However, since this patch alone is meaningful, I submit it separately. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index be0e5424f1..8d151ab397 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -170,6 +170,7 @@ static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); #ifdef FT_LCD_FILTER_H static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #endif +static FT_Error (*pFT_Property_Set)(FT_Library, const FT_String *, const FT_String *, const void *); #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> @@ -4162,6 +4163,7 @@ static BOOL init_freetype(void) #ifdef FT_LCD_FILTER_H pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); #endif + pFT_Property_Set = wine_dlsym(ft_handle, "FT_Property_Set", NULL, 0); if(pFT_Init_FreeType(&library) != 0) { ERR("Can't init FreeType library\n"); @@ -4176,6 +4178,13 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); + /* Freetype(< 2.8.1) v40's FT_LOAD_TARGET_MONO is not compatible with advance width. */ + if (pFT_Property_Set && FT_SimpleVersion < FT_VERSION_VALUE(2, 8, 1)) + { + FT_UInt interpreter_version = 35; + pFT_Property_Set( library, "truetype", "interpreter-version", &interpreter_version ); + } + font_driver = &freetype_funcs; return TRUE; -- 2.20.1

1 0