wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Józef Kucia : wined3d: Record sampler usage for WINED3DSIH_LD_RAW.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 84e3b8b933906423cc9f0e7f80b1f5ecd1c0b10a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e3b8b933906423cc9f0e7f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:36 2017 +0100 wined3d: Record sampler usage for WINED3DSIH_LD_RAW. 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/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2ce0ed0..ee597f0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1354,6 +1354,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st ins.src[2].reg.idx[0].offset, reg_maps->sampler_map.count); } else if (ins.handler_idx == WINED3DSIH_LD + || (ins.handler_idx == WINED3DSIH_LD_RAW && ins.src[1].reg.type == WINED3DSPR_RESOURCE) || (ins.handler_idx == WINED3DSIH_RESINFO && ins.src[1].reg.type == WINED3DSPR_RESOURCE)) { shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset,

1 0

Józef Kucia : wined3d: Handle declarations for raw buffer shader resources.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: e90bfc9462729a84375a0dc2cfe57fa93d9b6dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90bfc9462729a84375a0dc2c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:35 2017 +0100 wined3d: Handle declarations for raw buffer shader resources. 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 | 2 +- dlls/wined3d/shader.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 994c199..7f467e8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9235,7 +9235,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, - /* WINED3DSIH_DCL_RESOURCE_RAW */ NULL, + /* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_STREAM */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 82fa011..2ce0ed0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1024,6 +1024,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); } + else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_RAW) + { + unsigned int reg_idx = ins.declaration.dst.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->resource_info)) + { + ERR("Invalid resource index %u.\n", reg_idx); + break; + } + reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; + reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT; + reg_maps->resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; + } else if (ins.handler_idx == WINED3DSIH_DCL_SAMPLER) { if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE)

1 0

Józef Kucia : d3d11/tests: Add more tests for format reinterpreting SRVs.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 9dbbb224987da58ba349622a0c8347e2dca24b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbbb224987da58ba349622a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:34 2017 +0100 d3d11/tests: Add more tests for format reinterpreting SRVs. 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 | 50 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 229adc8..4ac69f9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5548,6 +5548,7 @@ static void test_texture(void) 0x00000000, 0x00100e46, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, }; + static const struct shader ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; static const DWORD ps_ld_sint8_code[] = { #if 0 @@ -5585,6 +5586,7 @@ static void test_texture(void) 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0a000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, }; + static const struct shader ps_ld_sint8 = {ps_ld_sint8_code, sizeof(ps_ld_sint8_code)}; static const DWORD ps_ld_uint8_code[] = { #if 0 @@ -5617,6 +5619,7 @@ static void test_texture(void) 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e, }; + static const struct shader ps_ld_uint8 = {ps_ld_uint8_code, sizeof(ps_ld_uint8_code)}; static const DWORD ps_sample_code[] = { #if 0 @@ -5643,6 +5646,7 @@ static void test_texture(void) 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; + static const struct shader ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; static const DWORD ps_sample_b_code[] = { #if 0 @@ -5672,6 +5676,7 @@ static void test_texture(void) 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; + static const struct shader ps_sample_b = {ps_sample_b_code, sizeof(ps_sample_b_code)}; static const DWORD ps_sample_l_code[] = { #if 0 @@ -5701,6 +5706,7 @@ static void test_texture(void) 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; + static const struct shader ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const DWORD ps_sample_2d_array_code[] = { #if 0 @@ -5732,12 +5738,6 @@ static void test_texture(void) 0x0020800a, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100246, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; - static const struct shader ps_ld = {ps_ld_code, sizeof(ps_ld_code)}; - static const struct shader ps_ld_sint8 = {ps_ld_sint8_code, sizeof(ps_ld_sint8_code)}; - static const struct shader ps_ld_uint8 = {ps_ld_uint8_code, sizeof(ps_ld_uint8_code)}; - static const struct shader ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; - static const struct shader ps_sample_b = {ps_sample_b_code, sizeof(ps_sample_b_code)}; - static const struct shader ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const struct shader ps_sample_2d_array = {ps_sample_2d_array_code, sizeof(ps_sample_2d_array_code)}; static const DWORD red_data[] = { @@ -5846,6 +5846,20 @@ static void test_texture(void) 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, }; + static const float r32_float[] = + { + 0.0f, 1.0f, 0.5f, 0.50f, + 1.0f, 0.0f, 0.0f, 0.75f, + 0.0f, 1.0f, 0.5f, 0.25f, + 1.0f, 0.0f, 0.0f, 0.75f, + }; + static const DWORD r32_uint[] = + { + 0, 1, 2, 3, + 100, 200, 255, 128, + 40, 30, 20, 10, + 250, 210, 155, 190, + }; static const struct texture rgba_texture = { 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -5889,6 +5903,10 @@ static void test_texture(void) {blue_data, 5 * sizeof(*blue_data)}, } }; + static const struct texture r32f_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, + {{r32_float, 4 * sizeof(*r32_float)}}}; + static const struct texture r32u_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, + {{r32_uint, 4 * sizeof(*r32_uint)}}}; static const DWORD red_colors[] = { 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, @@ -5973,6 +5991,20 @@ static void test_texture(void) 0x7e7e7e7e, 0x7e7e7e7e, 0x7e7e7e7e, 0x7e808080, 0x7e7e7e7e, 0x7e7f7f7f, 0x7e7f7f7f, 0x7e7f7f7f, }; + static const DWORD r32f_colors[] = + { + 0xff000000, 0xff0000ff, 0xff00007f, 0xff00007f, + 0xff0000ff, 0xff000000, 0xff000000, 0xff0000bf, + 0xff000000, 0xff0000ff, 0xff00007f, 0xff000040, + 0xff0000ff, 0xff000000, 0xff000000, 0xff0000bf, + }; + static const DWORD r32u_colors[16] = + { + 0x01000000, 0x01000001, 0x01000002, 0x01000003, + 0x01000064, 0x010000c8, 0x010000ff, 0x01000080, + 0x01000028, 0x0100001e, 0x01000014, 0x0100000a, + 0x010000fa, 0x010000d2, 0x0100009b, 0x010000be, + }; static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; @@ -6119,6 +6151,8 @@ static void test_texture(void) #define BC3_UNORM_SRGB DXGI_FORMAT_BC3_UNORM_SRGB #define R8G8B8A8_UNORM_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB #define R8G8B8A8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define R32_FLOAT DXGI_FORMAT_R32_FLOAT +#define R32_UINT DXGI_FORMAT_R32_UINT #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN {&ps_sample, &bc1_typeless, {BC1_UNORM, TEX_2D, 0, 1}, 0.0f, bc_colors}, {&ps_sample, &bc1_typeless, {BC1_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, @@ -6128,10 +6162,12 @@ static void test_texture(void) {&ps_sample, &bc3_typeless, {BC3_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, bc_colors}, {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM_SRGB, TEX_2D, 0, 1}, 0.0f, srgb_colors}, {&ps_sample, &srgb_typeless, {R8G8B8A8_UNORM, TEX_2D, 0, 1}, 0.0f, srgb_data}, + {&ps_sample, &r32f_typeless, {R32_FLOAT, TEX_2D, 0, 1}, 0.0f, r32f_colors}, {&ps_sample, &array_2d_texture, {FMT_UNKNOWN, TEX_2D, 0, 1}, 0.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 0, 1}, 0.0f, red_colors}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 1, 1}, 0.0f, green_data}, {&ps_sample_2d_array, &array_2d_texture, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 1, 2, 1}, 0.0f, blue_colors}, + {&ps_ld_uint8, &r32u_typeless, {R32_UINT, TEX_2D, 0, 1}, 0.0f, r32u_colors}, #undef TEX_2D #undef TEX_2D_ARRAY #undef BC1_UNORM @@ -6142,6 +6178,8 @@ static void test_texture(void) #undef BC3_UNORM_SRGB #undef R8G8B8A8_UNORM_SRGB #undef R8G8B8A8_UNORM +#undef R32_FLOAT +#undef R32_UINT #undef FMT_UNKNOWN };

1 0

Józef Kucia : d3d11/tests: Fix SM4 not instruction test.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 9d918659792ded2d67661f9da177da90b7a43ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d918659792ded2d67661f9da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:33 2017 +0100 d3d11/tests: Fix SM4 not instruction test. 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 | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3977f70..229adc8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10823,23 +10823,21 @@ static void test_uint_shader_instructions(void) static const DWORD ps_not_code[] = { #if 0 - uint bits[2]; + uint2 bits; uint4 main() : SV_Target { - return uint4(~bits[0], ~(bits[0] ^ ~0u), ~bits[1], ~(bits[1] ^ ~0u)); + return uint4(~bits.x, ~(bits.x ^ ~0u), ~bits.y, ~(bits.y ^ ~0u)); } #endif - 0x43425844, 0x1d56b429, 0xb5f4c0e1, 0x496a0bfd, 0xfc6f8e6f, 0x00000001, 0x00000140, 0x00000003, + 0x43425844, 0xaed0fd26, 0xf719a878, 0xc832efd6, 0xba03c264, 0x00000001, 0x00000100, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000c8, 0x00000040, 0x00000032, - 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, - 0x00000001, 0x08000057, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, - 0xffffffff, 0x0500003b, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x08000057, 0x00100012, - 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x00004001, 0xffffffff, 0x0500003b, 0x00102082, - 0x00000000, 0x0010000a, 0x00000000, 0x0600003b, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, - 0x00000000, 0x0600003b, 0x00102042, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x0100003e, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000088, 0x00000040, 0x00000022, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0b000057, 0x00100032, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x00004002, + 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x0500003b, 0x001020a2, 0x00000000, 0x00100406, + 0x00000000, 0x0600003b, 0x00102052, 0x00000000, 0x00208106, 0x00000000, 0x00000000, 0x0100003e, }; static const struct shader ps_bfi = {ps_bfi_code, sizeof(ps_bfi_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_ubfe = {ps_ubfe_code, sizeof(ps_ubfe_code), D3D_FEATURE_LEVEL_11_0}; @@ -10877,13 +10875,13 @@ static void test_uint_shader_instructions(void) {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}}, {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}}, - {&ps_ubfe, {0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, - {&ps_ubfe, {0xffffffff}, {0x0000000f, 0x007fffff, 0x0000007f, 0x3fffffff}}, - {&ps_ubfe, {0xff000000}, {0x00000000, 0x007f0000, 0x00000000, 0x3f800000}}, - {&ps_ubfe, {0x00ff0000}, {0x00000000, 0x0000ff00, 0x00000000, 0x007f8000}}, - {&ps_ubfe, {0x000000ff}, {0x0000000f, 0x00000000, 0x0000007f, 0x0000007f}}, - {&ps_ubfe, {0x80000001}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, - {&ps_ubfe, {0xc0000003}, {0x00000000, 0x00400000, 0x00000001, 0x20000001}}, + {&ps_ubfe, {0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ubfe, {0xffffffff}, {0x0000000f, 0x007fffff, 0x0000007f, 0x3fffffff}}, + {&ps_ubfe, {0xff000000}, {0x00000000, 0x007f0000, 0x00000000, 0x3f800000}}, + {&ps_ubfe, {0x00ff0000}, {0x00000000, 0x0000ff00, 0x00000000, 0x007f8000}}, + {&ps_ubfe, {0x000000ff}, {0x0000000f, 0x00000000, 0x0000007f, 0x0000007f}}, + {&ps_ubfe, {0x80000001}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ubfe, {0xc0000003}, {0x00000000, 0x00400000, 0x00000001, 0x20000001}}, {&ps_bfrev, {0x12345678}, {0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}}, {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}}, @@ -10927,7 +10925,7 @@ static void test_uint_shader_instructions(void) context = test_context.immediate_context; feature_level = ID3D11Device_GetFeatureLevel(device); - cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 4 * sizeof(tests[0].bits), NULL); + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(tests[0].bits), NULL); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc);

1 0

Józef Kucia : d3d10core/tests: Fix SM4 not instruction test.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 032701c9861009287d1cdb1e2b988f53123195c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032701c9861009287d1cdb1e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:32 2017 +0100 d3d10core/tests: Fix SM4 not instruction test. 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 | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 14634ad..3735d94 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9478,23 +9478,21 @@ static void test_uint_shader_instructions(void) static const DWORD ps_not_code[] = { #if 0 - uint bits[2]; + uint2 bits; uint4 main() : SV_Target { - return uint4(~bits[0], ~(bits[0] ^ ~0u), ~bits[1], ~(bits[1] ^ ~0u)); + return uint4(~bits.x, ~(bits.x ^ ~0u), ~bits.y, ~(bits.y ^ ~0u)); } #endif - 0x43425844, 0x1d56b429, 0xb5f4c0e1, 0x496a0bfd, 0xfc6f8e6f, 0x00000001, 0x00000140, 0x00000003, + 0x43425844, 0xaed0fd26, 0xf719a878, 0xc832efd6, 0xba03c264, 0x00000001, 0x00000100, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000c8, 0x00000040, 0x00000032, - 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, - 0x00000001, 0x08000057, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00004001, - 0xffffffff, 0x0500003b, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x08000057, 0x00100012, - 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x00004001, 0xffffffff, 0x0500003b, 0x00102082, - 0x00000000, 0x0010000a, 0x00000000, 0x0600003b, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, - 0x00000000, 0x0600003b, 0x00102042, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x0100003e, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000088, 0x00000040, 0x00000022, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0b000057, 0x00100032, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x00004002, + 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x0500003b, 0x001020a2, 0x00000000, 0x00100406, + 0x00000000, 0x0600003b, 0x00102052, 0x00000000, 0x00208106, 0x00000000, 0x00000000, 0x0100003e, }; static const struct shader ps_ftou = {ps_ftou_code, sizeof(ps_ftou_code)}; static const struct shader ps_not = {ps_not_code, sizeof(ps_not_code)}; @@ -9513,8 +9511,9 @@ static void test_uint_shader_instructions(void) {&ps_ftou, {BITS_INF}, {~0u, 0}}, {&ps_ftou, {BITS_N1_0}, { 0, 1}}, {&ps_ftou, {BITS_1_0}, { 1, 0}}, - {&ps_not, {0x00000000, 0xffffffff}, {0xffffffff, 0x00000000, 0x00000000, 0xffffffff}}, - {&ps_not, {0xf0f0f0f0, 0x0f0f0f0f}, {0x0f0f0f0f, 0xf0f0f0f0, 0xf0f0f0f0, 0x0f0f0f0f}}, + + {&ps_not, {0x00000000, 0xffffffff}, {0xffffffff, 0x00000000, 0x00000000, 0xffffffff}}, + {&ps_not, {0xf0f0f0f0, 0x0f0f0f0f}, {0x0f0f0f0f, 0xf0f0f0f0, 0xf0f0f0f0, 0x0f0f0f0f}}, }; if (!init_test_context(&test_context)) @@ -9522,7 +9521,7 @@ static void test_uint_shader_instructions(void) device = test_context.device; - cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, 4 * sizeof(tests[0].bits), NULL); + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(tests[0].bits), NULL); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc);

1 0

Józef Kucia : d3d10core/tests: Add tests for buffer ranges.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 076d6346a335ec1e19b96f6cfda31e3f0a9c4fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076d6346a335ec1e19b96f6cf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:31 2017 +0100 d3d10core/tests: Add tests for buffer ranges. 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 | 98 +++++++++++++++++++++++++++++++++---------- 1 file changed, 77 insertions(+), 21 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4e19727..14634ad 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10990,7 +10990,8 @@ static void test_buffer_srv(void) { struct buffer { - UINT byte_count; + unsigned int byte_count; + unsigned int data_offset; const void *data; }; @@ -11000,13 +11001,13 @@ static void test_buffer_srv(void) const struct buffer *current_buffer; ID3D10ShaderResourceView *srv; D3D10_BUFFER_DESC buffer_desc; + DWORD color, expected_color; struct resource_readback rb; ID3D10Buffer *cb, *buffer; ID3D10PixelShader *ps; ID3D10Device *device; unsigned int i, x, y; struct vec4 cb_size; - DWORD color; HRESULT hr; static const DWORD ps_float4_code[] = @@ -11052,8 +11053,30 @@ static void test_buffer_srv(void) 0xffffffff, 0xff0000ff, 0xff000000, 0xff00ff00, }; - static const struct buffer rgba16_buffer = {sizeof(rgba16), &rgba16}; - static const struct buffer rgba4_buffer = {sizeof(rgba4), &rgba4}; + static const BYTE r4[] = + { + 0xde, 0xad, + 0xba, 0xbe, + }; + static const struct buffer rgba16_buffer = {sizeof(rgba16), 0, &rgba16}; + static const struct buffer rgba16_offset_buffer = {256 + sizeof(rgba16), 256, &rgba16}; + static const struct buffer rgba4_buffer = {sizeof(rgba4), 0, &rgba4}; + static const struct buffer r4_buffer = {sizeof(r4), 0, &r4}; + static const struct buffer r4_offset_buffer = {256 + sizeof(r4), 256, &r4}; + static const DWORD rgba16_colors2x2[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ffff, 0xff00ffff, + 0xff0000ff, 0xff0000ff, 0xff00ffff, 0xff00ffff, + 0xff00ff00, 0xff00ff00, 0xffffff00, 0xffffff00, + 0xff00ff00, 0xff00ff00, 0xffffff00, 0xffffff00, + }; + static const DWORD rgba16_colors1x1[] = + { + 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, + 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, + }; static const DWORD rgba4_colors[] = { 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, @@ -11061,6 +11084,13 @@ static void test_buffer_srv(void) 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, }; + static const DWORD r4_colors[] = + { + 0xff0000de, 0xff0000de, 0xff0000ad, 0xff0000ad, + 0xff0000de, 0xff0000de, 0xff0000ad, 0xff0000ad, + 0xff0000ba, 0xff0000ba, 0xff0000be, 0xff0000be, + 0xff0000ba, 0xff0000ba, 0xff0000be, 0xff0000be, + }; static const DWORD zero_colors[16] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; @@ -11075,9 +11105,14 @@ static void test_buffer_srv(void) } tests[] = { - {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, {4.0f, 4.0f}, rgba16}, - {&rgba4_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba4_colors}, - {NULL, 0, 0, 0, {2.0f, 2.0f}, zero_colors}, + {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, {4.0f, 4.0f}, rgba16}, + {&rgba16_offset_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 64, 16, {4.0f, 4.0f}, rgba16}, + {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba16_colors2x2}, + {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 1, {1.0f, 1.0f}, rgba16_colors1x1}, + {&rgba4_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba4_colors}, + {&r4_buffer, DXGI_FORMAT_R8_UNORM, 0, 4, {2.0f, 2.0f}, r4_colors}, + {&r4_offset_buffer, DXGI_FORMAT_R8_UNORM, 256, 4, {2.0f, 2.0f}, r4_colors}, + {NULL, 0, 0, 0, {2.0f, 2.0f}, zero_colors}, }; if (!init_test_context(&test_context)) @@ -11104,12 +11139,12 @@ static void test_buffer_srv(void) { if (buffer) ID3D10Buffer_Release(buffer); - if (srv) - ID3D10ShaderResourceView_Release(srv); current_buffer = test->buffer; if (current_buffer) { + BYTE *data = NULL; + buffer_desc.ByteWidth = current_buffer->byte_count; buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; @@ -11117,25 +11152,44 @@ static void test_buffer_srv(void) buffer_desc.MiscFlags = 0; resource_data.SysMemPitch = 0; resource_data.SysMemSlicePitch = 0; - resource_data.pSysMem = current_buffer->data; + if (current_buffer->data_offset) + { + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, current_buffer->byte_count); + ok(!!data, "Failed to allocate memory.\n"); + memcpy(data + current_buffer->data_offset, current_buffer->data, + current_buffer->byte_count - current_buffer->data_offset); + resource_data.pSysMem = data; + } + else + { + resource_data.pSysMem = current_buffer->data; + } hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); ok(SUCCEEDED(hr), "Test %u: Failed to create buffer, hr %#x.\n", i, hr); - - srv_desc.Format = test->srv_format; - srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; - U(srv_desc).Buffer.ElementOffset = test->srv_first_element; - U(srv_desc).Buffer.ElementWidth = test->srv_element_count; - hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srv); - ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + HeapFree(GetProcessHeap(), 0, data); } else { buffer = NULL; - srv = NULL; } + } - ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + if (srv) + ID3D10ShaderResourceView_Release(srv); + if (current_buffer) + { + srv_desc.Format = test->srv_format; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.ElementOffset = test->srv_first_element; + U(srv_desc).Buffer.ElementWidth = test->srv_element_count; + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + srv = NULL; } + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); cb_size.x = test->size.x; cb_size.y = test->size.y; @@ -11150,8 +11204,10 @@ static void test_buffer_srv(void) for (x = 0; x < 4; ++x) { color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); - ok(compare_color(color, test->expected_colors[y * 4 + x], 1), - "Test %u: Got unexpected color 0x%08x at (%u, %u).\n", i, color, x, y); + expected_color = test->expected_colors[y * 4 + x]; + ok(compare_color(color, expected_color, 1), + "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", + i, color, expected_color, x, y); } } release_resource_readback(&rb);

1 0

Józef Kucia : wined3d: Fix condition to determine if FIXME message should be printed.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 847ad7437a7e134535b5d3ea291fd2ecabe4fd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=847ad7437a7e134535b5d3ea2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 15 14:27:30 2017 +0100 wined3d: Fix condition to determine if FIXME message should be printed. Spotted by Matteo Bruni. 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/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 85a93d0..06db44a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -166,7 +166,7 @@ static void create_buffer_texture(struct wined3d_gl_view *view, } else { - if (!offset || size != buffer->resource.size) + if (offset || size != buffer->resource.size) FIXME("OpenGL implementation does not support ARB_texture_buffer_range.\n"); GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object)); }

1 0

Michael Stefaniuc : hid/tests: Remove duplicated for condition ( coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: b89e3f80ae7a640ccd2d70aef67369273ec6abf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89e3f80ae7a640ccd2d70aef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:54:12 2017 +0100 hid/tests: Remove duplicated for condition (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index e72a500..a4c12ce 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -358,7 +358,7 @@ static void test_get_input_report(void) { ok(data[0] == 0, "Report ID (0) is not the first byte of the data\n"); report[0] = 0; - for (i = 0; i < Caps.InputReportByteLength && i < Caps.InputReportByteLength; i++) + for (i = 0; i < Caps.InputReportByteLength; i++) { char bytestr[5]; sprintf(bytestr, "%x ", (BYTE)data[i]);

1 0

Michael Stefaniuc : shell32/tests: Use the correct field for SW_SHOWNORMAL (coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: f20fa69c9bbffe182d23ead9408917f5e8c271da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20fa69c9bbffe182d23ead94… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:53:56 2017 +0100 shell32/tests: Use the correct field for SW_SHOWNORMAL (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3c757ec..3292c54 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -808,7 +808,7 @@ static void test_NonExistentPath(void) memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; - startup.dwFlags = SW_SHOWNORMAL; + startup.wShowWindow = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); winetest_wait_child_process( info.hProcess ); @@ -823,7 +823,7 @@ static void test_NonExistentPath(void) memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; - startup.dwFlags = SW_SHOWNORMAL; + startup.wShowWindow = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0,

1 0

Michael Stefaniuc : strmbase: Remove an always true if condition ( coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 37d8f36de6c131729da114deed04f83b7cd09c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d8f36de6c131729da114dee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:52:26 2017 +0100 strmbase: Remove an always true if condition (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/video.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 0f05d63..a03ba55 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -569,8 +569,7 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoPaletteEntries(IBasicVideo *iface, L if (!pRetrieved || !pPalette) return E_POINTER; - if (pRetrieved) - *pRetrieved = 0; + *pRetrieved = 0; return VFW_E_NO_PALETTE_AVAILABLE; }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017