wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Józef Kucia : wined3d: Implement SM5 ld_raw instruction.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 80bd7efcf8ed359edf2a4584c7cbcd6c867711fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bd7efcf8ed359edf2a4584c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:23 2017 +0100 wined3d: Implement SM5 ld_raw 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 | 49 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adc6746..b583453 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3831,9 +3831,7 @@ static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) dst = ins->dst[0]; for (i = 0; i < 4; ++i) { - write_mask = WINED3DSP_WRITEMASK_0 << i; - dst.write_mask = ins->dst[0].write_mask & write_mask; - + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; @@ -3864,9 +3862,7 @@ static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) dst = ins->dst[0]; for (i = 0; i < 4; ++i) { - write_mask = WINED3DSP_WRITEMASK_0 << i; - dst.write_mask = ins->dst[0].write_mask & write_mask; - + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; @@ -5034,6 +5030,45 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } +static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) +{ + const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + const struct wined3d_shader_src_param *src = &ins->src[1]; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct wined3d_shader_dst_param dst; + const char *function, *resource; + struct glsl_src_param offset; + char dst_swizzle[6]; + DWORD write_mask; + unsigned int i; + + if (src->reg.type == WINED3DSPR_RESOURCE) + { + function = "texelFetch"; + resource = "sampler"; + } + else + { + function = "imageLoad"; + resource = "image"; + } + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &offset); + + dst = ins->dst[0]; + for (i = 0; i < 4; ++i) + { + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); + if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, + &dst, dst.reg.data_type))) + continue; + + shader_glsl_swizzle_to_str(src->swizzle, FALSE, write_mask, dst_swizzle); + shader_addline(buffer, "%s(%s_%s%u, %s / 4)%s);\n", + function, prefix, resource, src->reg.idx[0].offset, offset.param_str, dst_swizzle); + } +} + static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -9359,7 +9394,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, - /* WINED3DSIH_LD_RAW */ NULL, + /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit,

1 0

Józef Kucia : d3d10core/tests: Add optional "rect" parameter to check_texture_sub_resource_* functions.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: e57dfb804494b52433b0d50315c0b71736cbd432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e57dfb804494b52433b0d5031… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:22 2017 +0100 d3d10core/tests: Add optional "rect" parameter to check_texture_sub_resource_* functions. 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 | 95 ++++++++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 763abcd..e289329 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -617,19 +617,25 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne return color; } -#define check_texture_sub_resource_color(t, s, c, d) check_texture_sub_resource_color_(__LINE__, t, s, c, d) +#define check_texture_sub_resource_color(a, b, c, d, e) check_texture_sub_resource_color_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_color_(unsigned int line, ID3D10Texture2D *texture, - unsigned int sub_resource_idx, DWORD expected_color, BYTE max_diff) + unsigned int sub_resource_idx, const RECT *rect, DWORD expected_color, BYTE max_diff) { struct resource_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; + RECT default_rect; DWORD color = 0; get_texture_readback(texture, sub_resource_idx, &rb); - for (y = 0; y < rb.height; ++y) + if (!rect) { - for (x = 0; x < rb.width; ++x) + SetRect(&default_rect, 0, 0, rb.width, rb.height); + rect = &default_rect; + } + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) { color = get_readback_color(&rb, x, y); if (!compare_color(color, expected_color, max_diff)) @@ -657,22 +663,28 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, ID3D10Texture2D_GetDesc(texture, &texture_desc); sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) - check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); + check_texture_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); } -#define check_texture_sub_resource_float(r, s, f, d) check_texture_sub_resource_float_(__LINE__, r, s, f, d) +#define check_texture_sub_resource_float(a, b, c, d, e) check_texture_sub_resource_float_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D *texture, - unsigned int sub_resource_idx, float expected_value, BYTE max_diff) + unsigned int sub_resource_idx, const RECT *rect, float expected_value, BYTE max_diff) { struct resource_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; float value = 0.0f; + RECT default_rect; get_texture_readback(texture, sub_resource_idx, &rb); - for (y = 0; y < rb.height; ++y) + if (!rect) + { + SetRect(&default_rect, 0, 0, rb.width, rb.height); + rect = &default_rect; + } + for (y = rect->top; y < rect->bottom; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = rect->left; x < rect->right; ++x) { value = get_readback_float(&rb, x, y); if (!compare_float(value, expected_value, max_diff)) @@ -700,22 +712,28 @@ static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, ID3D10Texture2D_GetDesc(texture, &texture_desc); sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) - check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); + check_texture_sub_resource_float_(line, texture, sub_resource_idx, NULL, expected_value, max_diff); } -#define check_texture_sub_resource_vec4(a, b, c, d) check_texture_sub_resource_vec4_(__LINE__, a, b, c, d) +#define check_texture_sub_resource_vec4(a, b, c, d, e) check_texture_sub_resource_vec4_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_vec4_(unsigned int line, ID3D10Texture2D *texture, - unsigned int sub_resource_idx, const struct vec4 *expected_value, BYTE max_diff) + unsigned int sub_resource_idx, const RECT *rect, const struct vec4 *expected_value, BYTE max_diff) { struct resource_readback rb; unsigned int x = 0, y = 0; struct vec4 value = {0}; BOOL all_match = TRUE; + RECT default_rect; get_texture_readback(texture, sub_resource_idx, &rb); - for (y = 0; y < rb.height; ++y) + if (!rect) + { + SetRect(&default_rect, 0, 0, rb.width, rb.height); + rect = &default_rect; + } + for (y = rect->top; y < rect->bottom; ++y) { - for (x = 0; x < rb.width; ++x) + for (x = rect->left; x < rect->right; ++x) { value = *get_readback_vec4(&rb, x, y); if (!compare_vec4(&value, expected_value, max_diff)) @@ -745,22 +763,28 @@ static void check_texture_vec4_(unsigned int line, ID3D10Texture2D *texture, ID3D10Texture2D_GetDesc(texture, &texture_desc); sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) - check_texture_sub_resource_vec4_(line, texture, sub_resource_idx, expected_value, max_diff); + check_texture_sub_resource_vec4_(line, texture, sub_resource_idx, NULL, expected_value, max_diff); } -#define check_texture_sub_resource_uvec4(a, b, c) check_texture_sub_resource_uvec4_(__LINE__, a, b, c) +#define check_texture_sub_resource_uvec4(a, b, c, d) check_texture_sub_resource_uvec4_(__LINE__, a, b, c, d) static void check_texture_sub_resource_uvec4_(unsigned int line, ID3D10Texture2D *texture, - unsigned int sub_resource_idx, const struct uvec4 *expected_value) + unsigned int sub_resource_idx, const RECT *rect, const struct uvec4 *expected_value) { struct resource_readback rb; unsigned int x = 0, y = 0; struct uvec4 value = {0}; BOOL all_match = TRUE; + RECT default_rect; get_texture_readback(texture, sub_resource_idx, &rb); - for (y = 0; y < rb.height; ++y) + if (!rect) { - for (x = 0; x < rb.width; ++x) + SetRect(&default_rect, 0, 0, rb.width, rb.height); + rect = &default_rect; + } + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) { value = *get_readback_uvec4(&rb, x, y); if (!compare_uvec4(&value, expected_value)) @@ -791,7 +815,7 @@ static void check_texture_uvec4_(unsigned int line, ID3D10Texture2D *texture, ID3D10Texture2D_GetDesc(texture, &texture_desc); sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) - check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, expected_value); + check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } static ID3D10Device *create_device(void) @@ -2509,7 +2533,7 @@ static void test_render_target_views(void) sub_resource_count = texture_desc.MipLevels * texture_desc.ArraySize; assert(sub_resource_count <= sizeof(test->expected_colors) / sizeof(*test->expected_colors)); for (j = 0; j < sub_resource_count; ++j) - check_texture_sub_resource_color(texture, j, test->expected_colors[j], 1); + check_texture_sub_resource_color(texture, j, NULL, test->expected_colors[j], 1); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(texture); @@ -10525,15 +10549,15 @@ static void test_sm4_ret_instruction(void) static void test_primitive_restart(void) { struct d3d10core_test_context test_context; - unsigned int stride, offset, x, y; ID3D10Buffer *ib32, *ib16, *vb; - struct resource_readback rb; + unsigned int stride, offset; ID3D10InputLayout *layout; ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10Device *device; unsigned int i; HRESULT hr; + RECT rect; static const DWORD ps_code[] = { @@ -10650,25 +10674,12 @@ static void test_primitive_restart(void) ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, black); ID3D10Device_DrawIndexed(device, 9, 0, 0); - get_texture_readback(test_context.backbuffer, 0, &rb); - for (y = 0; y < 480; ++y) - { - for (x = 0; x < 640; ++x) - { - DWORD color = get_readback_color(&rb, x, y); - DWORD expected_color; - if (x < 240) - expected_color = 0xffffff00; - else if (x >= 640 - 240) - expected_color = 0xff0000ff; - else - expected_color = 0x00000000; - 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); + SetRect(&rect, 0, 0, 240, 480); + check_texture_sub_resource_color(test_context.backbuffer, 0, &rect, 0xffffff00, 1); + SetRect(&rect, 240, 0, 400, 480); + check_texture_sub_resource_color(test_context.backbuffer, 0, &rect, 0x00000000, 1); + SetRect(&rect, 400, 0, 640, 480); + check_texture_sub_resource_color(test_context.backbuffer, 0, &rect, 0xff0000ff, 1); } ID3D10Buffer_Release(ib16);

1 0

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

16 Feb '17

Module: wine Branch: master Commit: 1703d49906fde4794b0d7bdd76306bdaf1ca9672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1703d49906fde4794b0d7bdd7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:21 2017 +0100 d3d10core/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/d3d10core/tests/device.c | 50 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3735d94..763abcd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5267,6 +5267,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 @@ -5304,6 +5305,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 @@ -5336,6 +5338,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 @@ -5362,6 +5365,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 @@ -5391,6 +5395,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 @@ -5420,6 +5425,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 @@ -5451,12 +5457,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[] = { @@ -5544,6 +5544,20 @@ static void test_texture(void) 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, 0x10, 0x7f, 0xb6, 0x6d, 0xdb, 0xb6, 0x6d, 0xdb, }; + 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, @@ -5583,6 +5597,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, @@ -5660,6 +5678,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}; @@ -5798,6 +5830,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}, @@ -5807,10 +5841,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 @@ -5821,6 +5857,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 : wined3d: Recognize SM5 imm_atomic_imin opcode.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: d0e7ffa0e4110301527442ced5af06240bccbda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e7ffa0e4110301527442ced… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:20 2017 +0100 wined3d: Recognize SM5 imm_atomic_imin opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3e32cab..24dcb05 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5144,6 +5144,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff24a92..adc6746 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9345,6 +9345,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0a07253..6f012cd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -164,6 +164,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", /* WINED3DSIH_IMM_ATOMIC_IMAX */ "imm_atomic_imax", + /* WINED3DSIH_IMM_ATOMIC_IMIN */ "imm_atomic_imin", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 44a9da9..61af803 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -284,6 +284,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, WINED3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba, + WINED3D_SM5_OP_IMM_ATOMIC_IMIN = 0xbb, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, @@ -1011,6 +1012,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, {WINED3D_SM5_OP_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_IMAX, "iU", "ii"}, + {WINED3D_SM5_OP_IMM_ATOMIC_IMIN, WINED3DSIH_IMM_ATOMIC_IMIN, "iU", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d63983..54adf26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -695,6 +695,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_IADD, WINED3DSIH_IMM_ATOMIC_IMAX, + WINED3DSIH_IMM_ATOMIC_IMIN, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMIN,

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_imax opcode.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 1a0042df77e46b89d8092b377e1c32e5bdee75d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0042df77e46b89d8092b377… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:19 2017 +0100 wined3d: Recognize SM5 imm_atomic_imax opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7ed83f4..3e32cab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5143,6 +5143,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9900b08..ff24a92 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9344,6 +9344,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, + /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4a31ff5..0a07253 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -163,6 +163,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", + /* WINED3DSIH_IMM_ATOMIC_IMAX */ "imm_atomic_imax", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index dff463f..44a9da9 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -283,6 +283,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, + WINED3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, @@ -1009,6 +1010,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_IMAX, "iU", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e40e8dc..9d63983 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -694,6 +694,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_IADD, + WINED3DSIH_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMIN,

1 0

Carlo Bramini : winmm: Fix wrong return type for midiInOpen and midiOutOpen.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 23439a0ae8a12cab5e9f56a061e7f094e7903818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23439a0ae8a12cab5e9f56a06… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Feb 12 13:58:55 2017 +0100 winmm: Fix wrong return type for midiInOpen and midiOutOpen. Signed-off-by: Carlo Bramini <carlo_bramini(a)users.sourceforge.net> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 8 ++++---- include/mmsystem.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0f3cd5d..1412d5e 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -413,12 +413,12 @@ static LPWINE_MIDI MIDI_OutAlloc(HMIDIOUT* lphMidiOut, DWORD_PTR* lpdwCallback, /************************************************************************** * midiOutOpen [WINMM.@] */ -UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HMIDIOUT hMidiOut; LPWINE_MIDI lpwm; - UINT dwRet; + MMRESULT dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags); @@ -699,12 +699,12 @@ UINT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSi /************************************************************************** * midiInOpen [WINMM.@] */ -UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, +MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { HANDLE hMidiIn; LPWINE_MIDI lpwm; - DWORD dwRet; + MMRESULT dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags); diff --git a/include/mmsystem.h b/include/mmsystem.h index f53f11d..721e5e6 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -778,7 +778,7 @@ UINT WINAPI midiOutSetVolume(HMIDIOUT,DWORD); UINT WINAPI midiOutGetErrorTextA(UINT,LPSTR,UINT); UINT WINAPI midiOutGetErrorTextW(UINT,LPWSTR,UINT); #define midiOutGetErrorText WINELIB_NAME_AW(midiOutGetErrorText) -UINT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD_PTR,DWORD_PTR,DWORD); UINT WINAPI midiOutClose(HMIDIOUT); UINT WINAPI midiOutPrepareHeader(HMIDIOUT,MIDIHDR*,UINT); UINT WINAPI midiOutUnprepareHeader(HMIDIOUT,MIDIHDR*,UINT); @@ -797,7 +797,7 @@ UINT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT); UINT WINAPI midiInGetErrorTextA(UINT,LPSTR,UINT); UINT WINAPI midiInGetErrorTextW(UINT,LPWSTR,UINT); #define midiInGetErrorText WINELIB_NAME_AW(midiInGetErrorText) -UINT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD_PTR,DWORD_PTR,DWORD); UINT WINAPI midiInClose(HMIDIIN); UINT WINAPI midiInPrepareHeader(HMIDIIN,MIDIHDR*,UINT); UINT WINAPI midiInUnprepareHeader(HMIDIIN,MIDIHDR*,UINT);

1 0

Francois Gouget : dwrite/tests: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: f9ef81b3c029696d6d621d870de1d3ce54769629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ef81b3c029696d6d621d870… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 11 14:18:46 2017 +0100 dwrite/tests: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c373d14..52c64ab 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -91,9 +91,9 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Henri Verbeet : wined3d: Send GL context destruction through the command stream.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 15bdcb407de4d205e2ad46e4270296930bda9634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bdcb407de4d205e2ad46e42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:56 2017 +0100 wined3d: Send GL context destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 57bec83..3777331 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -945,9 +945,10 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); } -static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) +static void wined3d_device_delete_opengl_contexts_cs(void *object) { struct wined3d_resource *resource, *cursor; + struct wined3d_device *device = object; struct wined3d_context *context; struct wined3d_shader *shader; @@ -978,6 +979,11 @@ static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) } } +static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) +{ + wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); +} + static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_context *context;

1 0

Henri Verbeet : wined3d: Send unordered access view GL initialisation through the command stream.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: 392213efb26207692c46e1fbc197a045f7948fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392213efb26207692c46e1fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:55 2017 +0100 wined3d: Send unordered access view GL initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 53 +++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 39be229..cb1935a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3463,7 +3463,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, else if (texture) { texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; - level = view->level_idx; + level = view->desc.u.texture.level_idx; } else { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 50e6e0a..2c411ff 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -682,12 +682,45 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ texture = texture_from_resource(resource); - sub_resource_idx = view->layer_idx * texture->level_count + view->level_idx; - layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->layer_count : 1; + sub_resource_idx = view->desc.u.texture.layer_idx * texture->level_count + view->desc.u.texture.level_idx; + layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->desc.u.texture.layer_count : 1; for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_unordered_access_view_cs_init(void *object) +{ + struct wined3d_unordered_access_view *view = object; + struct wined3d_resource *resource = view->resource; + struct wined3d_view_desc *desc = &view->desc; + const struct wined3d_gl_info *gl_info; + + gl_info = &resource->device->adapter->gl_info; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + create_buffer_view(&view->gl_view, desc, buffer, view->format); + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) + { + create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture), + desc, texture, view->format); + } + } +} + static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -699,6 +732,8 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->parent_ops = parent_ops; view->format = wined3d_get_format(gl_info, desc->format_id, resource->usage); + view->desc = *desc; + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) { if (view->format->id != WINED3DFMT_R32_TYPELESS) @@ -727,8 +762,6 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) return E_INVALIDARG; } - - create_buffer_view(&view->gl_view, desc, buffer, view->format); } else { @@ -746,19 +779,11 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces || !desc->u.texture.layer_count || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - - if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) - { - create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture), - desc, texture, view->format); - } - - view->layer_idx = desc->u.texture.layer_idx; - view->layer_count = desc->u.texture.layer_count; - view->level_idx = desc->u.texture.level_idx; } wined3d_resource_incref(view->resource = resource); + wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 512d33d..e40e8dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3370,10 +3370,9 @@ struct wined3d_unordered_access_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; + struct wined3d_view_desc desc; + struct wined3d_gl_view gl_view; - unsigned int layer_idx; - unsigned int layer_count; - unsigned int level_idx; }; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view,

1 0

Henri Verbeet : wined3d: Send shader resource view GL initialisation through the command stream.
by Alexandre Julliard 16 Feb '17

16 Feb '17

Module: wine Branch: master Commit: a772bbdfdaec60131a2068ee6ecac205fabe8242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a772bbdfdaec60131a2068ee6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 16 00:58:54 2017 +0100 wined3d: Send shader resource view GL initialisation through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 121 +++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 3 + 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7919e2e..50e6e0a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -177,7 +177,7 @@ static void create_buffer_texture(struct wined3d_gl_view *view, context_release(context); } -static HRESULT create_buffer_view(struct wined3d_gl_view *view, +static void create_buffer_view(struct wined3d_gl_view *view, const struct wined3d_view_desc *desc, struct wined3d_buffer *buffer, const struct wined3d_format *view_format) { @@ -186,22 +186,13 @@ static HRESULT create_buffer_view(struct wined3d_gl_view *view, if (desc->format_id == WINED3DFMT_UNKNOWN) { FIXME("Structured buffer views not supported.\n"); - return WINED3D_OK; + return; } - if (desc->u.buffer.start_idx > ~0u / view_format->byte_count - || desc->u.buffer.count > ~0u / view_format->byte_count) - return E_INVALIDARG; - offset = desc->u.buffer.start_idx * view_format->byte_count; size = desc->u.buffer.count * view_format->byte_count; - if (offset >= buffer->resource.size - || size > buffer->resource.size - offset) - return E_INVALIDARG; - create_buffer_texture(view, buffer, view_format, offset, size); - return WINED3D_OK; } ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) @@ -476,13 +467,61 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } +static void wined3d_shader_resource_view_cs_init(void *object) +{ + struct wined3d_shader_resource_view *view = object; + struct wined3d_resource *resource = view->resource; + const struct wined3d_format *view_format; + const struct wined3d_gl_info *gl_info; + const struct wined3d_view_desc *desc; + GLenum view_target; + + view_format = view->format; + gl_info = &resource->device->adapter->gl_info; + desc = &view->desc; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + create_buffer_view(&view->gl_view, desc, buffer, view_format); + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + + view_target = get_texture_view_target(gl_info, desc, texture); + + if (resource->format->id == view_format->id && texture->target == view_target + && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count + && !is_stencil_view_format(view_format)) + { + TRACE("Creating identity shader resource view.\n"); + } + else if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) + { + FIXME("Swapchain shader resource views not supported.\n"); + } + else if (resource->format->typeless_id == view_format->typeless_id + && resource->format->gl_view_class == view_format->gl_view_class) + { + create_texture_view(&view->gl_view, view_target, desc, texture, view_format); + } + else + { + FIXME("Shader resource view not supported, resource format %s, view format %s.\n", + debug_d3dformat(resource->format->id), debug_d3dformat(view_format->id)); + } + } +} + static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; const struct wined3d_format *view_format; - GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) @@ -502,17 +541,17 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ return E_INVALIDARG; } - view->refcount = 1; - view->parent = parent; - view->parent_ops = parent_ops; - if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - HRESULT hr; - if (FAILED(hr = create_buffer_view(&view->gl_view, desc, buffer, view_format))) - return hr; + if (view_format->byte_count) + { + unsigned int buffer_size = buffer->resource.size / view_format->byte_count; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return E_INVALIDARG; + } } else { @@ -525,32 +564,16 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ || desc->u.texture.layer_idx >= texture->layer_count || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG; - - view_target = get_texture_view_target(gl_info, desc, texture); - - if (resource->format->id == view_format->id && texture->target == view_target - && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count - && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count - && !is_stencil_view_format(view_format)) - { - TRACE("Creating identity shader resource view.\n"); - } - else if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) - { - FIXME("Swapchain shader resource views not supported.\n"); - } - else if (resource->format->typeless_id == view_format->typeless_id - && resource->format->gl_view_class == view_format->gl_view_class) - { - create_texture_view(&view->gl_view, view_target, desc, texture, view_format); - } - else - { - FIXME("Shader resource view not supported, resource format %s, view format %s.\n", - debug_d3dformat(resource->format->id), debug_d3dformat(view_format->id)); - } } + + view->refcount = 1; wined3d_resource_incref(view->resource = resource); + view->parent = parent; + view->parent_ops = parent_ops; + view->format = view_format; + view->desc = *desc; + + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view); return WINED3D_OK; } @@ -696,10 +719,16 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - HRESULT hr; - if (FAILED(hr = create_buffer_view(&view->gl_view, desc, buffer, view->format))) - return hr; + if (view->format->byte_count) + { + unsigned int buffer_size = buffer->resource.size / view->format->byte_count; + if (desc->u.buffer.start_idx >= buffer_size + || desc->u.buffer.count > buffer_size - desc->u.buffer.start_idx) + return E_INVALIDARG; + } + + create_buffer_view(&view->gl_view, desc, buffer, view->format); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6b42e5..512d33d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3352,6 +3352,9 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; + const struct wined3d_format *format; + struct wined3d_view_desc desc; + struct wined3d_gl_view gl_view; };

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
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