wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Nikolay Sivov : d2d1: Added support for ID2D1GdiInteropRenderTarget interface.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 74ed5c7067188db0eff739ed1f36ff2142421d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ed5c7067188db0eff739ed1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 14 18:19:00 2017 +0300 d2d1: Added support for ID2D1GdiInteropRenderTarget interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap_render_target.c | 8 +- dlls/d2d1/d2d1_private.h | 7 +- dlls/d2d1/dc_render_target.c | 8 +- dlls/d2d1/factory.c | 18 +--- dlls/d2d1/hwnd_render_target.c | 8 +- dlls/d2d1/render_target.c | 137 ++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 209 ++++++++++++++++++++++++++++++++++++++- dlls/d2d1/wic_render_target.c | 8 +- 8 files changed, 371 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74ed5c7067188db0eff73…

1 0

Józef Kucia : d3d11/tests: Add test for atomic instructions.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 826b1e9c7852f4bceb28b1129063c263c49d3730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826b1e9c7852f4bceb28b1129… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:13 2017 +0100 d3d11/tests: Add test for atomic 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/d3d11/tests/d3d11.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ff983b2..3977f70 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -66,6 +66,11 @@ struct vec4 float x, y, z, w; }; +struct ivec4 +{ + int x, y, z, w; +}; + struct uvec4 { unsigned int x, y, z, w; @@ -12842,6 +12847,177 @@ static void test_ps_cs_uav_binding(void) release_test_context(&test_context); } +static void test_ps_uav_atomic_instructions(void) +{ + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11UnorderedAccessView *uav; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + struct resource_readback rb; + ID3D11Buffer *cb, *raw_uav; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + unsigned int i, j; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const DWORD ps_atomics_code[] = + { +#if 0 + RWByteAddressBuffer u; + + uint4 v; + int4 i; + + void main() + { + u.InterlockedAnd(0 * 4, v.x); + u.InterlockedCompareStore(1 * 4, v.y, v.x); + u.InterlockedAdd(2 * 4, v.x); + u.InterlockedOr(3 * 4, v.x); + u.InterlockedMax(4 * 4, i.x); + u.InterlockedMin(5 * 4, i.x); + u.InterlockedMax(6 * 4, v.x); + u.InterlockedMin(7 * 4, v.x); + u.InterlockedXor(8 * 4, v.x); + } +#endif + 0x43425844, 0x24c6a30c, 0x2ce4437d, 0xdee8a0df, 0xd18cb4bc, 0x00000001, 0x000001ac, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000158, 0x00000050, 0x00000056, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300009d, 0x0011e000, 0x00000000, 0x080000a9, + 0x0011e000, 0x00000000, 0x00004001, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0b0000ac, + 0x0011e000, 0x00000000, 0x00004001, 0x00000004, 0x0020801a, 0x00000000, 0x00000000, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ad, 0x0011e000, 0x00000000, 0x00004001, 0x00000008, 0x0020800a, + 0x00000000, 0x00000000, 0x080000aa, 0x0011e000, 0x00000000, 0x00004001, 0x0000000c, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ae, 0x0011e000, 0x00000000, 0x00004001, 0x00000010, 0x0020800a, + 0x00000000, 0x00000001, 0x080000af, 0x0011e000, 0x00000000, 0x00004001, 0x00000014, 0x0020800a, + 0x00000000, 0x00000001, 0x080000b0, 0x0011e000, 0x00000000, 0x00004001, 0x00000018, 0x0020800a, + 0x00000000, 0x00000000, 0x080000b1, 0x0011e000, 0x00000000, 0x00004001, 0x0000001c, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ab, 0x0011e000, 0x00000000, 0x00004001, 0x00000020, 0x0020800a, + 0x00000000, 0x00000000, 0x0100003e, + }; + + static const char * const instructions[] = + { + "atomic_and", "atomic_cmp_store", "atomic_iadd", "atomic_or", + "atomic_imax", "atomic_imin", "atomic_umax", "atomic_umin", "atomic_xor", + }; + static const struct test + { + struct uvec4 v; + struct ivec4 i; + unsigned int input[sizeof(instructions) / sizeof(*instructions)]; + unsigned int expected_result[sizeof(instructions) / sizeof(*instructions)]; + } + tests[] = + { + {{1, 0}, {-1}, {0xffff, 0, 1, 0, 0, 0, 0, 0, 0xff}, { 1, 1, 2, 1, 0, ~0u, 1, 0, 0xfe}}, + {{~0u, ~0u}, { 0}, {0xffff, 0xf, 1, 0, 0, 0, 0, 9, ~0u}, {0xffff, 0xf, 0, ~0u, 0, 0, ~0u, 9, 0}}, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 2 * sizeof(struct uvec4), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + buffer_desc.ByteWidth = sizeof(tests->input); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &raw_uav); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + uav_desc.Format = DXGI_FORMAT_R32_TYPELESS; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = buffer_desc.ByteWidth / sizeof(*tests->input); + U(uav_desc).Buffer.Flags = D3D11_BUFFER_UAV_FLAG_RAW; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)raw_uav, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &rtv, NULL, + 0, 1, &uav, NULL); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = texture_desc.Width; + vp.Height = texture_desc.Height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + hr = ID3D11Device_CreatePixelShader(device, ps_atomics_code, sizeof(ps_atomics_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, + NULL, &test->v, 0, 0); + + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)raw_uav, 0, + NULL, test->input, 0, 0); + + draw_quad(&test_context); + + get_buffer_readback(raw_uav, &rb); + for (j = 0; j < sizeof(instructions) / sizeof(*instructions); ++j) + { + unsigned int value = get_readback_color(&rb, j, 0); + unsigned int expected = test->expected_result[j]; + + todo_wine_if(expected != test->input[j] + && (!strcmp(instructions[j], "atomic_imax") + || !strcmp(instructions[j], "atomic_imin") + || !strcmp(instructions[j], "atomic_umax") + || !strcmp(instructions[j], "atomic_umin"))) + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + } + release_resource_readback(&rb); + } + + ID3D11Buffer_Release(cb); + ID3D11Buffer_Release(raw_uav); + ID3D11PixelShader_Release(ps); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + ID3D11UnorderedAccessView_Release(uav); + release_test_context(&test_context); +} + static void test_sm4_ret_instruction(void) { struct d3d11_test_context test_context; @@ -14075,6 +14251,7 @@ START_TEST(d3d11) test_uav_load(); test_cs_uav_store(); test_ps_cs_uav_binding(); + test_ps_uav_atomic_instructions(); test_sm4_ret_instruction(); test_primitive_restart(); test_resinfo_instruction();

1 0

Józef Kucia : wined3d: Implement SM5 atomic_* instructions.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 5043770acff11971315a1bc626f8b5149ef49dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5043770acff11971315a1bc62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:12 2017 +0100 wined3d: Implement SM5 atomic_* 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 | 63 +++++++++++++++++++++++++++++++++------------- dlls/wined3d/shader.c | 8 +++--- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9e752e3..7a7501e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4926,21 +4926,13 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - struct glsl_src_param image_coord_param, image_data_param; + struct glsl_src_param coord_param, data_param, data_param2; enum wined3d_shader_resource_type resource_type; enum wined3d_data_type data_type; unsigned int uav_idx; DWORD coord_mask; const char *op; - switch (ins->handler_idx) - { - case WINED3DSIH_ATOMIC_IADD: op = "imageAtomicAdd"; break; - default: - ERR("Unhandled opcode %#x.\n", ins->handler_idx); - return; - } - uav_idx = ins->dst[0].reg.idx[0].offset; resource_type = reg_maps->uav_resource_info[uav_idx].type; if (resource_type >= ARRAY_SIZE(resource_type_info)) @@ -4951,11 +4943,46 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) data_type = reg_maps->uav_resource_info[uav_idx].data_type; coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; - shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); - shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); - shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s, %s);\n", - op, shader_glsl_get_prefix(version->type), uav_idx, - image_coord_param.param_str, image_data_param.param_str); + switch (ins->handler_idx) + { + case WINED3DSIH_ATOMIC_AND: + op = "imageAtomicAnd"; + break; + case WINED3DSIH_ATOMIC_CMP_STORE: + op = "imageAtomicCompSwap"; + break; + case WINED3DSIH_ATOMIC_IADD: + op = "imageAtomicAdd"; + break; + case WINED3DSIH_ATOMIC_OR: + op = "imageAtomicOr"; + break; + case WINED3DSIH_ATOMIC_XOR: + op = "imageAtomicXor"; + break; + default: + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + return; + } + + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &coord_param); + + if (reg_maps->uav_resource_info[uav_idx].flags & WINED3D_VIEW_BUFFER_RAW) + shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s / 4, ", + op, shader_glsl_get_prefix(version->type), uav_idx, coord_param.param_str); + else + shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s, ", + op, shader_glsl_get_prefix(version->type), uav_idx, coord_param.param_str); + + shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data_param, data_type); + shader_addline(ins->ctx->buffer, "%s", data_param.param_str); + if (ins->src_count >= 3) + { + shader_glsl_add_src_param_ext(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &data_param2, data_type); + shader_addline(ins->ctx->buffer, ", %s", data_param2.param_str); + } + + shader_addline(ins->ctx->buffer, ");\n"); } static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) @@ -9160,15 +9187,15 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ABS */ shader_glsl_map2gl, /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, - /* WINED3DSIH_ATOMIC_AND */ NULL, - /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, + /* WINED3DSIH_ATOMIC_AND */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_CMP_STORE */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_IMIN */ NULL, - /* WINED3DSIH_ATOMIC_OR */ NULL, + /* WINED3DSIH_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, - /* WINED3DSIH_ATOMIC_XOR */ NULL, + /* WINED3DSIH_ATOMIC_XOR */ shader_glsl_atomic, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ shader_glsl_bitwise_op, /* WINED3DSIH_BFREV */ shader_glsl_map2gl, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index dbf0430..82fa011 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1282,14 +1282,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD + if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) { unsigned int reg_idx; - if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD) - reg_idx = ins.dst[0].reg.idx[0].offset; - else + if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) reg_idx = ins.src[1].reg.idx[0].offset; + else + reg_idx = ins.dst[0].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) { ERR("Invalid UAV index %u.\n", reg_idx);

1 0

Józef Kucia : wined3d: Implement raw buffer views.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 2066d2463462c4a7f3463aa5fda1416fab4f35b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2066d2463462c4a7f3463aa5f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:11 2017 +0100 wined3d: Implement raw buffer views. 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 | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 48db879..97929cb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -189,12 +189,6 @@ static HRESULT create_buffer_view(struct wined3d_gl_view *view, return WINED3D_OK; } - if (desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - FIXME("Raw buffer views not supported.\n"); - return WINED3D_OK; - } - if (desc->u.buffer.start_idx > ~0u / view_format->byte_count || desc->u.buffer.count > ~0u / view_format->byte_count) return E_INVALIDARG; @@ -491,8 +485,18 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - if (wined3d_format_is_typeless(view_format) - && !(view_format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + if (view_format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view_format->id)); + return E_INVALIDARG; + } + + view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } + + if (wined3d_format_is_typeless(view_format)) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); return E_INVALIDARG; @@ -672,9 +676,18 @@ 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); + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + if (view->format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view->format->id)); + return E_INVALIDARG; + } + + view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } - if (wined3d_format_is_typeless(view->format) - && !(view->format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) + if (wined3d_format_is_typeless(view->format)) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); return E_INVALIDARG;

1 0

Józef Kucia : wined3d: Add support for buffer UAVs.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 167d4acfd21eca280f99a491ad20706908ef9a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167d4acfd21eca280f99a491a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:10 2017 +0100 wined3d: Add support for buffer UAVs. 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/context.c | 26 +++++++++++++------ dlls/wined3d/view.c | 69 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 60 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 59a1367..1d9e7ad 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3416,7 +3416,8 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_unordered_access_view *view; - struct wined3d_texture *texture; + struct wined3d_texture *texture = NULL; + struct wined3d_buffer *buffer; GLuint texture_name; unsigned int i; GLint level; @@ -3440,26 +3441,35 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, if (view->resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer unordered access views not implemented.\n"); - continue; + buffer = buffer_from_resource(view->resource); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); + } + else + { + texture = texture_from_resource(view->resource); + wined3d_texture_load(texture, context, FALSE); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); } context->uses_uavs = 1; - texture = texture_from_resource(view->resource); - wined3d_texture_load(texture, context, FALSE); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - if (view->gl_view.name) { texture_name = view->gl_view.name; level = 0; } - else + else if (texture) { texture_name = wined3d_texture_get_gl_texture(texture, FALSE)->name; level = view->level_idx; } + else + { + FIXME("Unsupported buffer unordered access view.\n"); + GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); + continue; + } GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, view->format->glInternal)); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index c1a92be..48db879 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -177,6 +177,39 @@ static void create_buffer_texture(struct wined3d_gl_view *view, context_release(context); } +static HRESULT create_buffer_view(struct wined3d_gl_view *view, + const struct wined3d_view_desc *desc, struct wined3d_buffer *buffer, + const struct wined3d_format *view_format) +{ + unsigned int offset, size; + + if (desc->format_id == WINED3DFMT_UNKNOWN) + { + FIXME("Structured buffer views not supported.\n"); + return WINED3D_OK; + } + + if (desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + FIXME("Raw buffer views not supported.\n"); + return WINED3D_OK; + } + + 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) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -472,32 +505,10 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + HRESULT hr; - if (desc->format_id == WINED3DFMT_UNKNOWN) - { - FIXME("Structured buffer views not supported.\n"); - } - else if (desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - FIXME("Raw buffer views not supported.\n"); - } - else - { - unsigned int offset, size; - - 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->gl_view, buffer, view_format, offset, size); - } + if (FAILED(hr = create_buffer_view(&view->gl_view, desc, buffer, view_format))) + return hr; } else { @@ -638,7 +649,7 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + wined3d_buffer_invalidate_location(buffer_from_resource(resource), location); return; } @@ -671,7 +682,11 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer unordered access views not supported.\n"); + 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; } else {

1 0

Józef Kucia : wined3d: Handle declarations for raw UAVs.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 10f0e7058525dc70966ab0e3a2d772b67410dea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f0e7058525dc70966ab0e3a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:09 2017 +0100 wined3d: Handle declarations for raw UAVs. 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 ++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c16463b..9e752e3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9219,7 +9219,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, - /* WINED3DSIH_DCL_UAV_RAW */ NULL, + /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index dcf77e9..dbf0430 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1045,6 +1045,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st ins.handler_idx, shader_version.type); } } + else if (ins.handler_idx == WINED3DSIH_DCL_UAV_RAW) + { + unsigned int reg_idx = ins.declaration.dst.reg.idx[0].offset; + if (reg_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV resource index %u.\n", reg_idx); + break; + } + reg_maps->uav_resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER; + reg_maps->uav_resource_info[reg_idx].data_type = WINED3D_DATA_UINT; + reg_maps->uav_resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW; + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61954ab..23a8559 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -824,6 +824,7 @@ struct wined3d_shader_resource_info { enum wined3d_shader_resource_type type; enum wined3d_data_type data_type; + unsigned int flags; }; #define WINED3D_SAMPLER_DEFAULT ~0x0u

1 0

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

14 Feb '17

Module: wine Branch: master Commit: c9630d7433a88f011437043c9c399c1f7751be29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9630d7433a88f011437043c9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:08 2017 +0100 d3d11/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/d3d11/tests/d3d11.c | 98 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 77 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2ad5d11..ff983b2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -13773,7 +13773,8 @@ static void test_buffer_srv(void) { struct buffer { - UINT byte_count; + unsigned int byte_count; + unsigned int data_offset; const void *data; }; @@ -13784,13 +13785,13 @@ static void test_buffer_srv(void) ID3D11ShaderResourceView *srv; D3D11_BUFFER_DESC buffer_desc; ID3D11DeviceContext *context; + DWORD color, expected_color; struct resource_readback rb; ID3D11Buffer *cb, *buffer; ID3D11PixelShader *ps; ID3D11Device *device; unsigned int i, x, y; struct vec4 cb_size; - DWORD color; HRESULT hr; static const DWORD ps_float4_code[] = @@ -13836,8 +13837,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, @@ -13845,6 +13868,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}; @@ -13859,9 +13889,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, NULL)) @@ -13889,12 +13924,12 @@ static void test_buffer_srv(void) { if (buffer) ID3D11Buffer_Release(buffer); - if (srv) - ID3D11ShaderResourceView_Release(srv); current_buffer = test->buffer; if (current_buffer) { + BYTE *data = NULL; + buffer_desc.ByteWidth = current_buffer->byte_count; buffer_desc.Usage = D3D11_USAGE_DEFAULT; buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; @@ -13903,25 +13938,44 @@ static void test_buffer_srv(void) buffer_desc.StructureByteStride = 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 = ID3D11Device_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 = D3D11_SRV_DIMENSION_BUFFER; - U(srv_desc).Buffer.FirstElement = test->srv_first_element; - U(srv_desc).Buffer.NumElements = test->srv_element_count; - hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)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; } + } - ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + if (srv) + ID3D11ShaderResourceView_Release(srv); + if (current_buffer) + { + srv_desc.Format = test->srv_format; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.FirstElement = test->srv_first_element; + U(srv_desc).Buffer.NumElements = test->srv_element_count; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + srv = NULL; } + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); cb_size.x = test->size.x; cb_size.y = test->size.y; @@ -13936,8 +13990,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: Honor buffer ranges for shader resource views.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 987096e0e1c9732768a765a122b3dc05f8514bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987096e0e1c9732768a765a12… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:07 2017 +0100 wined3d: Honor buffer ranges for shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 11 +++++++++++ dlls/wined3d/view.c | 45 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9285fee..0f44e09 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -158,6 +158,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_sync", ARB_SYNC }, {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, {"GL_ARB_texture_buffer_object", ARB_TEXTURE_BUFFER_OBJECT }, + {"GL_ARB_texture_buffer_range", ARB_TEXTURE_BUFFER_RANGE }, {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, {"GL_ARB_texture_compression_bptc", ARB_TEXTURE_COMPRESSION_BPTC }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, @@ -2795,6 +2796,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glWaitSync) /* GL_ARB_texture_buffer_object */ USE_GL_FUNC(glTexBufferARB) + /* GL_ARB_texture_buffer_range */ + USE_GL_FUNC(glTexBufferRange) /* GL_ARB_texture_compression */ USE_GL_FUNC(glCompressedTexImage2DARB) USE_GL_FUNC(glCompressedTexImage3DARB) @@ -3351,6 +3354,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; gl_info->limits.vertex_attribs = 16; + gl_info->limits.texture_buffer_offset_alignment = 1; gl_info->limits.glsl_vs_float_constants = 0; gl_info->limits.glsl_ps_float_constants = 0; gl_info->limits.arb_vs_float_constants = 0; @@ -3576,6 +3580,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_UNIFORM_BUFFER_BINDINGS, &gl_max); TRACE("Max uniform buffer bindings: %d.\n", gl_max); } + if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT, &gl_max); + gl_info->limits.texture_buffer_offset_alignment = gl_max; + TRACE("Minimum required texture buffer offset alignment %d.\n", gl_max); + } if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) gl_info->gl_ops.gl.p_glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->limits.shininess); @@ -3693,6 +3703,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, + {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index c3e6d49..c1a92be 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -130,7 +130,8 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target } static void create_buffer_texture(struct wined3d_gl_view *view, - struct wined3d_buffer *buffer, const struct wined3d_format *view_format) + struct wined3d_buffer *buffer, const struct wined3d_format *view_format, + unsigned int offset, unsigned int size) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -144,13 +145,31 @@ static void create_buffer_texture(struct wined3d_gl_view *view, return; } + if ((offset & (gl_info->limits.texture_buffer_offset_alignment - 1))) + { + FIXME("Buffer offset %u is not %u byte aligned.\n", + offset, gl_info->limits.texture_buffer_offset_alignment); + context_release(context); + return; + } + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); view->target = GL_TEXTURE_BUFFER; gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); context_bind_texture(context, GL_TEXTURE_BUFFER, view->name); - GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object)); + if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]) + { + GL_EXTCALL(glTexBufferRange(GL_TEXTURE_BUFFER, view_format->glInternal, + buffer->buffer_object, offset, size)); + } + else + { + 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)); + } checkGLcall("Create buffer texture"); context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); @@ -464,14 +483,20 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ } else { - /* FIXME: Support for buffer offsets can be implemented using ARB_texture_buffer_range. */ - if (desc->u.buffer.start_idx - || desc->u.buffer.count * view_format->byte_count != buffer->resource.size) - { - FIXME("Ignoring buffer range %u-%u.\n", desc->u.buffer.start_idx, desc->u.buffer.count); - } - - create_buffer_texture(&view->gl_view, buffer, view_format); + unsigned int offset, size; + + 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->gl_view, buffer, view_format, offset, size); } } else diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 72d617e..e500df6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -91,6 +91,7 @@ enum wined3d_gl_extension ARB_SYNC, ARB_TEXTURE_BORDER_CLAMP, ARB_TEXTURE_BUFFER_OBJECT, + ARB_TEXTURE_BUFFER_RANGE, ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_COMPRESSION_BPTC, ARB_TEXTURE_COMPRESSION_RGTC, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6252a2..61954ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2208,6 +2208,8 @@ struct wined3d_gl_limits UINT samples; UINT vertex_attribs; + unsigned int texture_buffer_offset_alignment; + UINT glsl_varyings; UINT glsl_vs_float_constants; UINT glsl_ps_float_constants;

1 0

Józef Kucia : d3d11/tests: Mark some tests as broken on Nvidia drivers.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: e262c4031bb32d2aee82ca35b7dbb3fea1715b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e262c4031bb32d2aee82ca35b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:06 2017 +0100 d3d11/tests: Mark some tests as broken on Nvidia drivers. 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 | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index abb0c23..2ad5d11 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1022,6 +1022,17 @@ static BOOL is_amd_device(ID3D11Device *device) return adapter_desc.VendorId == 0x1002; } +static BOOL is_nvidia_device(ID3D11Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + + if (!strcmp(winetest_platform, "wine")) + return FALSE; + + get_device_adapter_desc(device, &adapter_desc); + return adapter_desc.VendorId == 0x10de; +} + static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window, const struct swapchain_desc *swapchain_desc) { DXGI_SWAP_CHAIN_DESC dxgi_desc; @@ -8496,7 +8507,9 @@ static void test_clear_render_target_view(void) D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; D3D11_TEXTURE2D_DESC texture_desc; ID3D11DeviceContext *context; + struct resource_readback rb; ID3D11Device *device; + unsigned int i, j; HRESULT hr; if (!init_test_context(&test_context, NULL)) @@ -8565,15 +8578,20 @@ static void test_clear_render_target_view(void) ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); check_texture_color(texture, expected_color, 1); - if (!is_warp_device(device)) - { - ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); - todo_wine check_texture_color(texture, expected_srgb_color, 1); - } - else + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + get_texture_readback(texture, 0, &rb); + for (i = 0; i < 4; ++i) { - win_skip("Skipping broken test on WARP.\n"); + for (j = 0; j < 4; ++j) + { + BOOL broken_device = is_warp_device(device) || is_nvidia_device(device); + DWORD color = get_readback_color(&rb, 80 + i * 160, 60 + j * 120); + todo_wine ok(compare_color(color, expected_srgb_color, 1) + || broken(compare_color(color, expected_color, 1) && broken_device), + "Got unexpected color 0x%08x.\n", color); + } } + release_resource_readback(&rb); ID3D11RenderTargetView_Release(srgb_rtv); ID3D11RenderTargetView_Release(rtv); @@ -11052,6 +11070,7 @@ static void test_index_buffer_offset(void) { 1.0f, -1.0f, 0.0f, 1.0f}, {3.0f}, {-1.0f, -1.0f, 0.0f, 1.0f}, {1.0f}, }; + static const struct vec4 broken_result = {0.0f, 0.0f, 0.0f, 1.0f}; if (!init_test_context(&test_context, &feature_level)) return; @@ -11102,7 +11121,8 @@ static void test_index_buffer_offset(void) for (i = 0; i < sizeof(expected_data) / sizeof(*expected_data); ++i) { data = get_readback_vec4(&rb, i, 0); - ok(compare_vec4(data, &expected_data[i], 0), + ok(compare_vec4(data, &expected_data[i], 0) + || broken(is_nvidia_device(device) && !(i % 2) && compare_vec4(data, &broken_result, 0)), "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, i); }

1 0

Carlo Bramini : winmm: RegQueryValueExW wants the size in bytes, not the size in characters.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 1cc27eba14375564228d2d9db8fdd1073997928e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc27eba14375564228d2d9db… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Sun Feb 12 14:00:47 2017 +0100 winmm: RegQueryValueExW wants the size in bytes, not the size in characters. 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/playsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 5d9aed0..6525db5 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -140,7 +140,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName) if (err != 0) goto none; } - count = sizeof(str)/sizeof(str[0]); + count = sizeof(str); err = RegQueryValueExW(hSnd, NULL, 0, &type, (LPBYTE)str, &count); RegCloseKey(hSnd); if (err != 0 || !*str) goto none;

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
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