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

Józef Kucia : wined3d: Implement sampleinfo instruction.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 9ddffbd3c08d977a24e4cd2a13c969e0de36a0f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ddffbd3c08d977a24e4cd2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 15 10:51:44 2018 +0200 wined3d: Implement sampleinfo instruction. 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/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 43 ++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/wined3d_gl.h | 1 + 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c058737..74d4d19 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -162,6 +162,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, {"GL_ARB_shader_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT}, + {"GL_ARB_shader_texture_image_samples", ARB_SHADER_TEXTURE_IMAGE_SAMPLES}, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, @@ -3938,6 +3939,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, + {ARB_SHADER_TEXTURE_IMAGE_SAMPLES, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eddf35d..40d19d0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6022,6 +6022,45 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) shader_addline(buffer, ")%s);\n", dst_swizzle); } +static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + enum wined3d_shader_resource_type resource_type; + enum wined3d_data_type dst_data_type; + unsigned int resource_idx, bind_idx; + char dst_swizzle[6]; + DWORD write_mask; + + if (!gl_info->supported[ARB_SHADER_TEXTURE_IMAGE_SAMPLES]) + { + FIXME("textureSamples() is not supported.\n"); + return; + } + + dst_data_type = ins->dst[0].reg.data_type; + if (ins->flags == WINED3DSI_SAMPLE_INFO_UINT) + dst_data_type = WINED3D_DATA_UINT; + else if (ins->flags) + FIXME("Unhandled flags %#x.\n", ins->flags); + + resource_idx = ins->src[0].reg.idx[0].offset; + resource_type = reg_maps->resource_info[resource_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); + + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], dst_data_type); + shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); + shader_addline(buffer, "%s(textureSamples(%s_sampler%u), 0, 0, 0)%s);\n", + dst_data_type == WINED3D_DATA_UINT ? "uvec4" : "vec4", + shader_glsl_get_prefix(reg_maps->shader_version.type), bind_idx, dst_swizzle); +} + static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -7514,6 +7553,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); if (gl_info->supported[ARB_SHADER_STORAGE_BUFFER_OBJECT]) shader_addline(buffer, "#extension GL_ARB_shader_storage_buffer_object : enable\n"); + if (gl_info->supported[ARB_SHADER_TEXTURE_IMAGE_SAMPLES]) + shader_addline(buffer, "#extension GL_ARB_shader_texture_image_samples : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) @@ -11309,7 +11350,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_C_LZ */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, - /* WINED3DSIH_SAMPLE_INFO */ NULL, + /* WINED3DSIH_SAMPLE_INFO */ shader_glsl_sample_info, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3750dee..be1b596 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1712,7 +1712,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, ins.src[3].reg.idx[0].offset, reg_maps->sampler_map.count); } - else if (ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) + else if ((ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) + || ins.handler_idx == WINED3DSIH_SAMPLE_INFO) { shader_record_sample(reg_maps, ins.src[0].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 49205f9..db1929d 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -95,6 +95,7 @@ enum wined3d_gl_extension ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_IMAGE_SIZE, ARB_SHADER_STORAGE_BUFFER_OBJECT, + ARB_SHADER_TEXTURE_IMAGE_SAMPLES, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADING_LANGUAGE_420PACK,

1 0

Józef Kucia : wined3d: Reject uploads for multisample textures.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: c05b39e77f24feaca5c0b34a858751cf9e193281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05b39e77f24feaca5c0b34a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 15 10:51:45 2018 +0200 wined3d: Reject uploads for multisample textures. 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/texture.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dadcd03..0b05453 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1919,15 +1919,20 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); level = sub_resource_idx % texture->level_count; - if (target == GL_TEXTURE_1D_ARRAY) - { - dst_y = sub_resource_idx / texture->level_count; - update_h = 1; - } - else if (target == GL_TEXTURE_2D_ARRAY) + switch (target) { - dst_z = sub_resource_idx / texture->level_count; - update_d = 1; + case GL_TEXTURE_1D_ARRAY: + dst_y = sub_resource_idx / texture->level_count; + update_h = 1; + break; + case GL_TEXTURE_2D_ARRAY: + dst_z = sub_resource_idx / texture->level_count; + update_d = 1; + break; + case GL_TEXTURE_2D_MULTISAMPLE: + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: + FIXME("Not supported for multisample textures.\n"); + return; } bo.buffer_object = data->buffer_object;

1 0

Józef Kucia : wined3d: Add ARB_sample_shading extension.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 9f353bf14fe62ac251f3acab18a92813438747a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f353bf14fe62ac251f3acab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 15 10:51:47 2018 +0200 wined3d: Add ARB_sample_shading extension. 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/directx.c | 4 ++++ dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 74d4d19..e125c5f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -155,6 +155,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, + {"GL_ARB_sample_shading", ARB_SAMPLE_SHADING }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_seamless_cube_map", ARB_SEAMLESS_CUBE_MAP }, {"GL_ARB_shader_atomic_counters", ARB_SHADER_ATOMIC_COUNTERS }, @@ -2813,6 +2814,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glPointParameterfvARB) /* GL_ARB_provoking_vertex */ USE_GL_FUNC(glProvokingVertex) + /* GL_ARB_sample_shading */ + USE_GL_FUNC(glMinSampleShadingARB) /* GL_ARB_sampler_objects */ USE_GL_FUNC(glGenSamplers) USE_GL_FUNC(glDeleteSamplers) @@ -3898,6 +3901,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_DRAW_INDIRECT, MAKEDWORD_VERSION(4, 0)}, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, + {ARB_SAMPLE_SHADING, MAKEDWORD_VERSION(4, 0)}, {ARB_TESSELLATION_SHADER, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_GATHER, MAKEDWORD_VERSION(4, 0)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 40d19d0..2a57acd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7629,6 +7629,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_fragment_coord_conventions : enable\n"); if (gl_info->supported[ARB_FRAGMENT_LAYER_VIEWPORT]) shader_addline(buffer, "#extension GL_ARB_fragment_layer_viewport : enable\n"); + if (gl_info->supported[ARB_SAMPLE_SHADING]) + shader_addline(buffer, "#extension GL_ARB_sample_shading : enable\n"); if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); /* The spec says that it doesn't have to be explicitly enabled, but the diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index db1929d..3140526 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -88,6 +88,7 @@ enum wined3d_gl_extension ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, + ARB_SAMPLE_SHADING, ARB_SAMPLER_OBJECTS, ARB_SEAMLESS_CUBE_MAP, ARB_SHADER_ATOMIC_COUNTERS,

1 0

Józef Kucia : wined3d: Implement sampleinfo for render targets.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 630c7bb7e1fc828e35ef3a87a959628ef1ef446d URL: https://source.winehq.org/git/wine.git/?a=commit;h=630c7bb7e1fc828e35ef3a87… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 15 10:51:48 2018 +0200 wined3d: Implement sampleinfo for render targets. 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 | 62 ++++++++++++++++++++++++++++++------------ dlls/wined3d/shader.c | 6 +++- dlls/wined3d/shader_sm4.c | 3 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 52 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2a57acd..7a7764b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6027,38 +6027,64 @@ static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_shader_dst_param *dst = ins->dst; + const struct wined3d_shader_src_param *src = ins->src; enum wined3d_shader_resource_type resource_type; enum wined3d_data_type dst_data_type; unsigned int resource_idx, bind_idx; char dst_swizzle[6]; DWORD write_mask; - if (!gl_info->supported[ARB_SHADER_TEXTURE_IMAGE_SAMPLES]) - { - FIXME("textureSamples() is not supported.\n"); - return; - } - - dst_data_type = ins->dst[0].reg.data_type; + dst_data_type = dst->reg.data_type; if (ins->flags == WINED3DSI_SAMPLE_INFO_UINT) dst_data_type = WINED3D_DATA_UINT; else if (ins->flags) FIXME("Unhandled flags %#x.\n", ins->flags); - resource_idx = ins->src[0].reg.idx[0].offset; - resource_type = reg_maps->resource_info[resource_idx].type; - if (resource_type >= ARRAY_SIZE(resource_type_info)) + write_mask = shader_glsl_append_dst_ext(buffer, ins, dst, dst_data_type); + shader_glsl_get_swizzle(src, FALSE, write_mask, dst_swizzle); + + if (dst_data_type == WINED3D_DATA_UINT) + shader_addline(buffer, "uvec4("); + else + shader_addline(buffer, "vec4("); + + if (src->reg.type == WINED3DSPR_RASTERIZER) { - ERR("Unexpected resource type %#x.\n", resource_type); - return; + if (gl_info->supported[ARB_SAMPLE_SHADING]) + { + shader_addline(buffer, "gl_NumSamples"); + } + else + { + FIXME("OpenGL implementation does not support ARB_sample_shading.\n"); + shader_addline(buffer, "1"); + } } - bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); + else + { + resource_idx = src->reg.idx[0].offset; + resource_type = reg_maps->resource_info[resource_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); - write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], dst_data_type); - shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); - shader_addline(buffer, "%s(textureSamples(%s_sampler%u), 0, 0, 0)%s);\n", - dst_data_type == WINED3D_DATA_UINT ? "uvec4" : "vec4", - shader_glsl_get_prefix(reg_maps->shader_version.type), bind_idx, dst_swizzle); + if (gl_info->supported[ARB_SHADER_TEXTURE_IMAGE_SAMPLES]) + { + shader_addline(buffer, "textureSamples(%s_sampler%u)", + shader_glsl_get_prefix(reg_maps->shader_version.type), bind_idx); + } + else + { + FIXME("textureSamples() is not supported.\n"); + shader_addline(buffer, "1"); + } + } + + shader_addline(buffer, ", 0, 0, 0)%s);\n", dst_swizzle); } static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index be1b596..45ae04a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1713,7 +1713,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co ins.src[3].reg.idx[0].offset, reg_maps->sampler_map.count); } else if ((ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) - || ins.handler_idx == WINED3DSIH_SAMPLE_INFO) + || (ins.handler_idx == WINED3DSIH_SAMPLE_INFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE)) { shader_record_sample(reg_maps, ins.src[0].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); @@ -2337,6 +2337,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "null"); break; + case WINED3DSPR_RASTERIZER: + shader_addline(buffer, "rasterizer"); + break; + case WINED3DSPR_RESOURCE: shader_addline(buffer, "t"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b56f16a..b119e8f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -318,6 +318,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_PRIMID = 0x0b, WINED3D_SM4_RT_DEPTHOUT = 0x0c, WINED3D_SM4_RT_NULL = 0x0d, + WINED3D_SM4_RT_RASTERIZER = 0x0e, WINED3D_SM4_RT_OMASK = 0x0f, WINED3D_SM5_RT_STREAM = 0x10, WINED3D_SM5_RT_FUNCTION_BODY = 0x11, @@ -1132,7 +1133,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, - /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_RASTERIZER */ WINED3DSPR_RASTERIZER, /* WINED3D_SM4_RT_OMASK */ WINED3DSPR_SAMPLEMASK, /* WINED3D_SM5_RT_STREAM */ WINED3DSPR_STREAM, /* WINED3D_SM5_RT_FUNCTION_BODY */ WINED3DSPR_FUNCTIONBODY, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb20842..b2e4372 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -497,6 +497,7 @@ enum wined3d_shader_register_type WINED3DSPR_GSINSTID, WINED3DSPR_DEPTHOUTGE, WINED3DSPR_DEPTHOUTLE, + WINED3DSPR_RASTERIZER, }; enum wined3d_data_type

1 0

Józef Kucia : d2d1/tests: Adjust expected value for linear brush test.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 372451253c1d0a173ea2bca418f9ec50d5fb32a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=372451253c1d0a173ea2bca4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 15 12:42:20 2018 +0200 d2d1/tests: Adjust expected value for linear brush test. Fixes the test on Linux with Nvidia. 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/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9bd9e2b..f833294 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1754,7 +1754,7 @@ static void test_linear_brush(void) {200, 150, 0xffc03e00}, {240, 150, 0xffffffff}, {280, 150, 0xffffffff}, {320, 150, 0xffffffff}, {240, 180, 0xffffffff}, {280, 180, 0xffff4040}, {320, 180, 0xffff4040}, {380, 180, 0xffffffff}, {200, 210, 0xffffffff}, {240, 210, 0xffa99640}, {280, 210, 0xffb28d40}, {320, 210, 0xffbb8440}, - {360, 210, 0xffc47b40}, {400, 210, 0xffffffff}, {200, 240, 0xffffffff}, {280, 240, 0xff41fd40}, + {360, 210, 0xffc47b40}, {400, 210, 0xffffffff}, {200, 240, 0xffffffff}, {280, 240, 0xff41fe40}, {320, 240, 0xff49f540}, {360, 240, 0xff52ec40}, {440, 240, 0xffffffff}, {240, 270, 0xffffffff}, {280, 270, 0xff408eb0}, {320, 270, 0xff4097a7}, {360, 270, 0xff40a19e}, {440, 270, 0xffffffff}, {280, 300, 0xffffffff}, {320, 300, 0xff4040ff}, {360, 300, 0xff4040ff}, {400, 300, 0xff406ad4},

1 0

Lucian Poston : d3d11: Return 0 for the class instance count from the shader getters.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 7ec5ec584acccf10edb6a55f80e8e7aefb5d7d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec5ec584acccf10edb6a55f… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Tue May 15 20:35:12 2018 +0430 d3d11: Return 0 for the class instance count from the shader getters. Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++++++ dlls/d3d11/tests/d3d11.c | 25 +++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e4d8760..5bc5018 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1522,6 +1522,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) @@ -1577,6 +1579,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) @@ -1745,6 +1749,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) @@ -2187,6 +2193,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) @@ -2294,6 +2302,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) @@ -2426,6 +2436,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..9c12a76 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9684,6 +9684,7 @@ static void test_clear_state(void) float blend_factor[4]; ID3D11Device *device; BOOL predicate_value; + UINT instance_count; DXGI_FORMAT format; UINT sample_mask; UINT stencil_ref; @@ -9719,8 +9720,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9738,8 +9741,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9757,8 +9762,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9776,8 +9783,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9796,8 +9805,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9816,8 +9827,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) {

1 0

Alistair Leslie-Hughes : dsound: Use IDirectSoundBuffer8 to avoid unnecessary casts.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 883df92aa12aac1705f33c772429b708d18a0f3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=883df92aa12aac1705f33c77… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 14 02:11:25 2018 +0000 dsound: Use IDirectSoundBuffer8 to avoid unnecessary casts. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 90 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=883df92aa12aac1705f3…

1 0

Akihiro Sagawa : winmm: Fix superfluous MOM_DONE callback messages.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 1c38d47e4dbf80c842a8c656cabc0f34c66ecf10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c38d47e4dbf80c842a8c656… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon May 14 21:24:08 2018 +0900 winmm: Fix superfluous MOM_DONE callback messages. This is a regression introduced by 185d98bbfdbf7ef10ef52d0264a5a38aedd3b19d. Because midiOutLongMsg's MOM_DONE callback message confuses an application, we don't rely on midiOut callback routine anymore in MIDI stream processing. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 18 ++++++++++++++++-- dlls/winmm/winmm.c | 13 +++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index b0efe16..b62b461 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -433,8 +433,12 @@ static void test_midiOut_device(UINT udev, HWND hwnd) return; } - rc = midiOutOpen(&hm, udev, 0, (DWORD_PTR)0, CALLBACK_NULL); + if (hwnd) + rc = midiOutOpen(&hm, udev, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); + else + rc = midiOutOpen(&hm, udev, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + test_notification(hwnd, "midiOutOpen", MOM_OPEN, 0); memset(&mhdr, 0, sizeof(mhdr)); mhdr.lpData = (LPSTR)SysEx_reset; @@ -445,6 +449,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + test_notification(hwnd, "midiOutLongMsg", MOM_DONE, (DWORD_PTR)&mhdr); Sleep(60); mhdr.lpData = (LPSTR)SysEx_volume_off; @@ -455,6 +460,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + test_notification(hwnd, "midiOutLongMsg", MOM_DONE, (DWORD_PTR)&mhdr); { DWORD e = 0x006F4593; /* velocity 111, note #69, channel 4 */ @@ -476,9 +482,11 @@ static void test_midiOut_device(UINT udev, HWND hwnd) ok(!rc, "midiOutLongMsg rc=%s\n", mmsys_error(rc)); rc = midiOutUnprepareHeader(hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); + test_notification(hwnd, "midiOutLongMsg", MOM_DONE, (DWORD_PTR)&mhdr); rc = midiOutClose(hm); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); + test_notification(hwnd, "midiOuClose", MOM_CLOSE, 0); } static void test_position(HMIDISTRM hm, UINT typein, UINT typeout) @@ -789,8 +797,12 @@ static void test_midiStream(UINT udev, HWND hwnd) #define ROUNDUP4(n) (((n) + 3) & ~3) hm = NULL; - rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)0, (DWORD_PTR)0, CALLBACK_NULL); + if (hwnd) + rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); + else + rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + test_notification(hwnd, "midiStreamOpen", MOM_OPEN, 0); midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); midiprop.tdiv.dwTimeDiv = 480; @@ -841,6 +853,7 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = playStream(hm, &mhdr); ok(!rc, "midiStreamOut rc=%s\n", mmsys_error(rc)); + test_notification(hwnd, "midiStreamOut", MOM_DONE, (DWORD_PTR)&mhdr); rc = midiOutUnprepareHeader((HMIDIOUT)hm, &mhdr, sizeof(mhdr)); ok(!rc, "midiOutUnprepare rc=%s\n", mmsys_error(rc)); @@ -849,6 +862,7 @@ static void test_midiStream(UINT udev, HWND hwnd) } rc = midiStreamClose(hm); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); + test_notification(hwnd, "midiStreamClose", MOM_CLOSE, 0); } static BOOL scan_subkeys(HKEY parent, const LPCSTR *sub_keys) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index b97580e..e0a2360 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1224,12 +1224,13 @@ the_end: */ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) { + WINE_MIDI* lpwm; WINE_MIDIStream* lpMidiStrm; MMRESULT ret = 0; TRACE("(%p)!\n", hMidiStrm); - if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) + if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, &lpwm)) return MMSYSERR_INVALHANDLE; midiStreamStop(hMidiStrm); @@ -1244,6 +1245,9 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) } CloseHandle(lpMidiStrm->hThread); } + DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, + (HDRVR)lpMidiStrm->hDevice, MM_MOM_CLOSE, + lpwm->mod.dwInstance, 0, 0); if(!ret) HeapFree(GetProcessHeap(), 0, lpMidiStrm); @@ -1294,7 +1298,8 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpwm->mld.uDeviceID = *lpuDeviceID; - ret = MMDRV_Open(&lpwm->mld, MODM_OPEN, (DWORD_PTR)&lpwm->mod, fdwOpen); + /* don't rely on midiOut callbacks */ + ret = MMDRV_Open(&lpwm->mld, MODM_OPEN, (DWORD_PTR)&lpwm->mod, CALLBACK_NULL); if (ret != MMSYSERR_NOERROR) { MMDRV_Free(hMidiOut, &lpwm->mld); HeapFree(GetProcessHeap(), 0, lpMidiStrm); @@ -1320,6 +1325,10 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n", *lpuDeviceID, lpwm->mld.uDeviceID, *lphMidiStrm, ret, lpMidiStrm); + + DriverCallback(lpwm->mod.dwCallback, lpMidiStrm->wFlags, + (HDRVR)lpMidiStrm->hDevice, MM_MOM_OPEN, + lpwm->mod.dwInstance, 0, 0); return ret; }

1 0

Zebediah Figura : kernel32: Check only the low word of CS when printing exceptions.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 9321aa40f5ba79352d346c04f4d428d143575fb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9321aa40f5ba79352d346c04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 15 15:02:23 2018 -0500 kernel32: Check only the low word of CS when printing exceptions. Fixes messages along the lines of wine: Unhandled page fault at address 0xf7bd0023:0x7b43d14c (thread 006c), starting debugger... Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/except.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 2a9f0f1..de244fc 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -150,9 +150,9 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in if ((len<0) || (len>=size)) return -1; #ifdef __i386__ - if (ptr->ContextRecord->SegCs != wine_get_cs()) + if (LOWORD(ptr->ContextRecord->SegCs) != wine_get_cs()) len2 = snprintf(buffer+len, size-len, " at address 0x%04x:0x%08x", - ptr->ContextRecord->SegCs, + LOWORD(ptr->ContextRecord->SegCs), (DWORD)ptr->ExceptionRecord->ExceptionAddress); else #endif

1 0

Dmitry Timoshkov : mstask: Prefer built-in implementation.
by Alexandre Julliard 15 May '18

15 May '18

Module: wine Branch: master Commit: 1f6a295a73134aa83b41394a11126263cc03d459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f6a295a73134aa83b41394a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 15 16:26:35 2018 +0800 mstask: Prefer built-in implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/mstask_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index e747af6..b028b15 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -41,8 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL;

1 0