December 2017 - Wine-commits

Józef Kucia : wined3d: Fix SM4 discard_z instruction.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: f3e612bf16664b44cbbec4b25dc185137e472d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e612bf16664b44cbbec4b25… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:11 2017 +0100 wined3d: Fix SM4 discard_z 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/glsl_shader.c | 3 ++- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/shader_sm4.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 317152c..568514b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6604,10 +6604,11 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { if (ins->ctx->reg_maps->shader_version.major >= 4) { + const char *condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; struct glsl_src_param src_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (bool(%s)) discard;\n", src_param.param_str); + shader_addline(ins->ctx->buffer, "if (%s(%s)) discard;\n", condition, src_param.param_str); } else { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3707d15..c4eed76 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2958,7 +2958,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (ins.handler_idx == WINED3DSIH_BREAKP || ins.handler_idx == WINED3DSIH_CONTINUEP || ins.handler_idx == WINED3DSIH_IF - || ins.handler_idx == WINED3DSIH_RETP) + || ins.handler_idx == WINED3DSIH_RETP + || ins.handler_idx == WINED3DSIH_TEXKILL) { switch (ins.flags) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a04debe..2665a67 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -894,7 +894,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "f", "f"}, - {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "u"}, + {WINED3D_SM4_OP_DISCARD, WINED3DSIH_TEXKILL, "", "u", + shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, "f", "ff"}, {WINED3D_SM4_OP_DP2, WINED3DSIH_DP2, "f", "ff"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "f", "ff"},

1 0

Józef Kucia : wined3d: Introduce helper function to generate conditional instructions.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 577ccfdda991156028496772645ac1f592d03e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577ccfdda9911560284967726… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:12 2017 +0100 wined3d: Introduce helper function to generate conditional instructions. 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 | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 568514b..98cd321 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5068,13 +5068,20 @@ static void shader_glsl_default(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "default:\n"); } -static void shader_glsl_if(const struct wined3d_shader_instruction *ins) +static void shader_glsl_generate_conditional_op(const struct wined3d_shader_instruction *ins, + const char *op) { - const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; - struct glsl_src_param src0_param; + struct glsl_src_param src_param; + const char *condition; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) {\n", condition, src0_param.param_str); + condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_addline(ins->ctx->buffer, "if (%s(%s)) %s\n", condition, src_param.param_str, op); +} + +static void shader_glsl_if(const struct wined3d_shader_instruction *ins) +{ + shader_glsl_generate_conditional_op(ins, "{"); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins) @@ -5128,22 +5135,19 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) static void shader_glsl_conditional_op(const struct wined3d_shader_instruction *ins) { - const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; - struct glsl_src_param src_param; const char *op; switch (ins->handler_idx) { - case WINED3DSIH_BREAKP: op = "break"; break; - case WINED3DSIH_CONTINUEP: op = "continue"; break; - case WINED3DSIH_RETP: op = "return"; break; + case WINED3DSIH_BREAKP: op = "break;"; break; + case WINED3DSIH_CONTINUEP: op = "continue;"; break; + case WINED3DSIH_RETP: op = "return;"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; } - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) %s;\n", condition, src_param.param_str, op); + shader_glsl_generate_conditional_op(ins, op); } static void shader_glsl_continue(const struct wined3d_shader_instruction *ins) @@ -6604,11 +6608,7 @@ static void shader_glsl_texkill(const struct wined3d_shader_instruction *ins) { if (ins->ctx->reg_maps->shader_version.major >= 4) { - const char *condition = ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ ? "bool" : "!bool"; - struct glsl_src_param src_param; - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (%s(%s)) discard;\n", condition, src_param.param_str); + shader_glsl_generate_conditional_op(ins, "discard;"); } else {

1 0

Józef Kucia : d3d11/tests: Add test for SM4 discard instruction.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 8fd53fe015f6cf33ca79fe5ac1415d74913154d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd53fe015f6cf33ca79fe5ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:13 2017 +0100 d3d11/tests: Add test for SM4 discard 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/d3d11/tests/d3d11.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 59f2e6e..2447cd7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12991,6 +12991,102 @@ static void test_sm4_continuec_instruction(void) release_test_context(&test_context); } +static void test_sm4_discard_instruction(void) +{ + ID3D11PixelShader *ps_discard_nz, *ps_discard_z; + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11Device *device; + ID3D11Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_discard_nz_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (data) + discard; + return float4(0.0f, 0.5f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xfa7e5758, 0xd8716ffc, 0x5ad6a940, 0x2b99bba2, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0404000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_discard_z_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (!data) + discard; + return float4(0.0f, 1.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x5c4dd108, 0x1eb43558, 0x7c02c98c, 0xd81eb34c, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct uvec4 values[] = + { + {0x0000000}, + {0x0000001}, + {0x8000000}, + {0xfffffff}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(*values), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + hr = ID3D11Device_CreatePixelShader(device, ps_discard_nz_code, sizeof(ps_discard_nz_code), + NULL, &ps_discard_nz); + ok(SUCCEEDED(hr), "Failed to create discard_nz pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_discard_z_code, sizeof(ps_discard_z_code), + NULL, &ps_discard_z); + ok(SUCCEEDED(hr), "Failed to create discard_z pixel shader, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(values); ++i) + { + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &values[i], 0, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_PSSetShader(context, ps_discard_nz, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xffffffff : 0xff007f00, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_PSSetShader(context, ps_discard_z, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xff00ff00 : 0xffffffff, 1); + } + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps_discard_nz); + ID3D11PixelShader_Release(ps_discard_z); + release_test_context(&test_context); +} + static void test_sm5_swapc_instruction(void) { struct input @@ -22506,6 +22602,7 @@ START_TEST(d3d11) test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction(); + test_sm4_discard_instruction(); test_sm5_swapc_instruction(); test_create_input_layout(); test_input_assembler();

1 0

Józef Kucia : d3d10core/tests: Add test for SM4 discard instruction.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 7afbeb5dddaecdafeecb52fd96ed5acfe08d2029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afbeb5dddaecdafeecb52fd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 22 13:11:14 2017 +0100 d3d10core/tests: Add test for SM4 discard 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/d3d10core/tests/device.c | 93 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f947811..4228773 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9715,6 +9715,98 @@ static void test_sm4_continuec_instruction(void) release_test_context(&test_context); } +static void test_sm4_discard_instruction(void) +{ + ID3D10PixelShader *ps_discard_nz, *ps_discard_z; + struct d3d10core_test_context test_context; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_discard_nz_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (data) + discard; + return float4(0.0f, 0.5f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xfa7e5758, 0xd8716ffc, 0x5ad6a940, 0x2b99bba2, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0404000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_discard_z_code[] = + { +#if 0 + uint data; + + float4 main() : SV_Target + { + if (!data) + discard; + return float4(0.0f, 1.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x5c4dd108, 0x1eb43558, 0x7c02c98c, 0xd81eb34c, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000058, 0x00000040, 0x00000016, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400000d, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct uvec4 values[] = + { + {0x0000000}, + {0x0000001}, + {0x8000000}, + {0xfffffff}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(*values), NULL); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + hr = ID3D10Device_CreatePixelShader(device, ps_discard_nz_code, sizeof(ps_discard_nz_code), &ps_discard_nz); + ok(SUCCEEDED(hr), "Failed to create discard_nz pixel shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_discard_z_code, sizeof(ps_discard_z_code), &ps_discard_z); + ok(SUCCEEDED(hr), "Failed to create discard_z pixel shader, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(values); ++i) + { + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &values[i], 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + ID3D10Device_PSSetShader(device, ps_discard_nz); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xffffffff : 0xff007f00, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + ID3D10Device_PSSetShader(device, ps_discard_z); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, values[i].x ? 0xff00ff00 : 0xffffffff, 1); + } + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps_discard_nz); + ID3D10PixelShader_Release(ps_discard_z); + release_test_context(&test_context); +} + static void test_create_input_layout(void) { D3D10_INPUT_ELEMENT_DESC layout_desc[] = @@ -12979,6 +13071,7 @@ START_TEST(device) test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction(); + test_sm4_discard_instruction(); test_create_input_layout(); test_input_assembler(); test_null_sampler();

1 0

Matteo Bruni : wined3d: Refuse to create texture views changing format from non-typeless.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 21c7b94c810c4722e060a105dbb66958b058f7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c7b94c810c4722e060a105d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 27 20:17:32 2017 +0100 wined3d: Refuse to create texture views changing format from non-typeless. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 14 ++++++++++++++ dlls/wined3d/view.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5eda92a..f739685 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3815,6 +3815,20 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali return slice_pitch * depth; } +BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, enum wined3d_format_id format2) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_srgb_info); ++i) + { + if (format1 == format_srgb_info[i].srgb_format_id) + return format2 == format_srgb_info[i].base_format_id; + if (format1 == format_srgb_info[i].base_format_id) + return format2 == format_srgb_info[i].srgb_format_id; + } + return FALSE; +} + /***************************************************************************** * Trace formatting of useful values */ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 62f087b..b35b66b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -128,6 +128,14 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ struct wined3d_texture *texture = texture_from_resource(resource); unsigned int depth_or_layer_count; + if (resource->format->id != format->id && !wined3d_format_is_typeless(resource->format) + && !wined3d_formats_are_srgb_variants(resource->format->id, format->id)) + { + WARN("Trying to create incompatible view for non typeless format %s.\n", + debug_d3dformat(format->id)); + return NULL; + } + if (mip_slice && resource->type == WINED3D_RTYPE_TEXTURE_3D) depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a9ac2e..bd4a210 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4251,6 +4251,8 @@ BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, enum wined3d_format_id view_format_id) DECLSPEC_HIDDEN; const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN; +BOOL wined3d_formats_are_srgb_variants(enum wined3d_format_id format1, + enum wined3d_format_id format2) DECLSPEC_HIDDEN; BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : d3d11: Disallow 0-sized buffer shader resource views.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: ee00b90fa45dfbaf912d22886b29e52784ecc19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee00b90fa45dfbaf912d22886… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:29:57 2017 +0100 d3d11: Disallow 0-sized buffer shader resource views. Signed-off-by: Matteo Bruni <mbruni(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 | 15 +++++++++++++++ dlls/d3d11/view.c | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2447cd7..f636a85 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18433,6 +18433,21 @@ static void test_buffer_srv(void) cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(cb_size), NULL); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + buffer_desc.ByteWidth = 256; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + srv_desc.Format = DXGI_FORMAT_R8_UNORM; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.FirstElement = 0; + U(srv_desc).Buffer.NumElements = 0; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srv); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ID3D11Buffer_Release(buffer); + ps = NULL; srv = NULL; buffer = NULL; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index f747c4b..034a494 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -616,6 +616,11 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } + if (!desc->u.Buffer.u2.NumElements) + { + WARN("Zero sized buffer view.\n"); + return E_INVALIDARG; + } return S_OK; }

1 0

Matteo Bruni : d3d11/tests: Add a couple of testcases for UINT format SRVs.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 9f11f4adf1d76f9e819ae4e6888e3dc7735ed84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f11f4adf1d76f9e819ae4e68… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:29:59 2017 +0100 d3d11/tests: Add a couple of testcases for UINT format SRVs. Signed-off-by: Matteo Bruni <mbruni(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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f636a85..906761d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3274,6 +3274,7 @@ static void test_create_shader_resource_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_SRV_DIMENSION_UNKNOWN #define TEX_1D D3D11_SRV_DIMENSION_TEXTURE1D @@ -3344,6 +3345,8 @@ static void test_create_shader_resource_view(void) {{ 1, 13, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{ 1, 14, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{ 1, 18, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 3}}, + {{ 1, 1, RGBA8_UINT}, {0}, {RGBA8_UINT, TEX_2D, 0, 1, 0, 1}}, + {{ 1, 1, RGBA8_TL}, {RGBA8_UINT, TEX_2D, 0, ~0u}, {RGBA8_UINT, TEX_2D, 0, 1, 0, 1}}, }; static const struct { @@ -3394,6 +3397,8 @@ static void test_create_shader_resource_view(void) {{TEX_2D, 1, 7, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 2, ~0u}}, {{TEX_2D, 1, 7, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{TEX_2D, 1, 9, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 1, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0, 1}},

1 0

Matteo Bruni : wined3d: Add texture flag for mipmap generation.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 22eabf1db797178ffb2fe3132a96166bd1eb8a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eabf1db797178ffb2fe3132… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:30:00 2017 +0100 wined3d: Add texture flag for mipmap generation. Signed-off-by: Matteo Bruni <mbruni(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 | 16 +++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ef8545d..7a8e1fb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -384,6 +384,15 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GET_DC; if (flags & WINED3D_TEXTURE_CREATE_DISCARD) texture->flags |= WINED3D_TEXTURE_DISCARD; + if (flags & WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS) + { + if (~format->flags[WINED3D_GL_RES_TYPE_TEX_2D] + & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + WARN("Format doesn't support mipmaps generation, " + "ignoring WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag.\n"); + else + texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; + } return WINED3D_OK; } @@ -1573,8 +1582,13 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) { - /* TODO: Implement filters using GL_SGI_generate_mipmaps. */ FIXME("texture %p stub!\n", texture); + + if (!(texture->flags & WINED3D_TEXTURE_GENERATE_MIPMAPS)) + { + WARN("Texture without the WINED3D_TEXTURE_GENERATE_MIPMAPS flag, ignoring.\n"); + return; + } } static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd4a210..0daa861 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3074,6 +3074,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_DC_IN_USE 0x00001000 #define WINED3D_TEXTURE_DISCARD 0x00002000 #define WINED3D_TEXTURE_GET_DC 0x00004000 +#define WINED3D_TEXTURE_GENERATE_MIPMAPS 0x00008000 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f35d980..a0ac7ba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1538,6 +1538,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_TEXTURE_CREATE_DISCARD 0x00000002 #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 +#define WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS 0x00000010 #define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff

1 0

Matteo Bruni : d3d11: Validate D3D11_RESOURCE_MISC_GENERATE_MIPS flag for 2D textures.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 3561645aa30143d213c2dd420381365b5d2ff298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3561645aa30143d213c2dd420… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 23:30:01 2017 +0100 d3d11: Validate D3D11_RESOURCE_MISC_GENERATE_MIPS flag for 2D textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index ef2c9a2..12186dc 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -472,6 +472,14 @@ static BOOL validate_texture2d_desc(const D3D11_TEXTURE2D_DESC *desc) return FALSE; } + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS + && (~desc->BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE))) + { + WARN("D3D11_RESOURCE_MISC_GENERATE_MIPS used without D3D11_BIND_RENDER_TARGET and " + "D3D11_BIND_SHADER_RESOURCE.\n"); + return FALSE; + } + return TRUE; }

1 0

Piotr Caban : msvcrt: Fix buffer size checks in swscanf_s.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 7aa67f1e5f4e0ecafe9fbeec982326c4d78bf883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa67f1e5f4e0ecafe9fbeec9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 1 12:29:08 2017 +0100 msvcrt: Fix buffer size checks in swscanf_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 6 +++--- dlls/msvcrt/tests/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 2920b9b..cbbcae4 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -540,7 +540,7 @@ _FUNCTION_ { char *str = suppress ? NULL : va_arg(ap, char*); char *pstr = str; #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(char); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif @@ -566,7 +566,7 @@ _FUNCTION_ { MSVCRT_wchar_t *str = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); MSVCRT_wchar_t *pstr = str; #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(MSVCRT_wchar_t); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif @@ -615,7 +615,7 @@ _FUNCTION_ { ULONG *Mask; int invert = 0; /* Set if we are NOT to find the chars */ #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(_CHAR_); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 372d2f8..359b079 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -324,9 +324,43 @@ static void test_swscanf( void ) ok(c == 'b', "c = %x\n", c); } +static void test_swscanf_s(void) +{ + static const wchar_t fmt1[] = {'%','c',0}; + static const wchar_t fmt2[] = {'%','[','a','-','z',']',0}; + + int (WINAPIV *pswscanf_s)(const wchar_t*,const wchar_t*,...); + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + wchar_t buf[2], out[2]; + int ret; + + pswscanf_s = (void*)GetProcAddress(hmod, "swscanf_s"); + if(!pswscanf_s) { + win_skip("swscanf_s not available\n"); + return; + } + + buf[0] = 'a'; + buf[1] = '1'; + out[1] = 'b'; + ret = pswscanf_s(buf, fmt1, out, 1); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(out[1] == 'b', "out[1] = %x\n", out[1]); + + ret = pswscanf_s(buf, fmt2, out, 1); + ok(!ret, "swscanf_s returned %d\n", ret); + + ret = pswscanf_s(buf, fmt2, out, 2); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(!out[1], "out[1] = %x\n", out[1]); +} + START_TEST(scanf) { test_sscanf(); test_sscanf_s(); test_swscanf(); + test_swscanf_s(); }

1 0