June 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_hull_shader() .
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: eaf48206c1cec875f5ebfda5440328ff926af95c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaf48206c1cec875f5ebfda5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:26 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_hull_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f72d6eb..ae08f61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8013,14 +8013,13 @@ static void shader_glsl_generate_shader_phase_invocation(struct wined3d_string_b } } -static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_hull_shader *hs = &shader->u.hs; const struct wined3d_shader_phase *phase; struct shader_glsl_ctx_priv priv_ctx; @@ -8542,6 +8541,7 @@ static GLuint find_glsl_vshader(const struct wined3d_context *context, struct sh static GLuint find_glsl_hull_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_hs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int new_size; @@ -8578,7 +8578,7 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_hull_shader(context, priv, shader); + ret = shader_glsl_generate_hull_shader(context_gl, priv, shader); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret;

1 0

Alexandre Julliard : wsnmp32: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 454c4e599c7347c191bb0e9b0808e22acb614477 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454c4e599c7347c191bb0e9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:44:25 2019 +0200 wsnmp32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsnmp32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wsnmp32/Makefile.in b/dlls/wsnmp32/Makefile.in index 6fadba0..db01f47 100644 --- a/dlls/wsnmp32/Makefile.in +++ b/dlls/wsnmp32/Makefile.in @@ -1,4 +1,6 @@ MODULE = wsnmp32.dll IMPORTLIB = wsnmp32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = wsnmp32.c

1 0

Henri Verbeet : wined3d: Use Windows 7 as fallback driver version in wined3d_driver_info_init().
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 08033be01b40caaa0b5c4f0b53999069639f4cc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08033be01b40caaa0b5c4f0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:28 2019 +0430 wined3d: Use Windows 7 as fallback driver version in wined3d_driver_info_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7202a90..72c3de9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -609,10 +609,10 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, break; default: - FIXME("Unhandled OS version %u.%u, reporting 2000/XP.\n", + FIXME("Unhandled OS version %u.%u, reporting Windows 7.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); - driver_os_version = 6; - driver_model = DRIVER_MODEL_NT5X; + driver_os_version = 8; + driver_model = DRIVER_MODEL_NT6X; break; } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_pshader().
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: c65d522f917226a418da44a2f7c74d1a9e73c3fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c65d522f917226a418da44a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:24 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_pshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3c74ff7..f6f0c46 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7518,17 +7518,16 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - const struct wined3d_shader *shader, - const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) + const struct wined3d_shader *shader, const struct ps_compile_args *args, + struct ps_np2fixup_info *np2fixup_info) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const char *prefix = shader_glsl_get_prefix(version->type); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); + const char *prefix = shader_glsl_get_prefix(version->type); unsigned int i, extra_constants_needed = 0; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; @@ -7683,7 +7682,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) { - if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", args->render_offscreen ? "" : "origin_upper_left, "); else if (!args->render_offscreen) @@ -7765,7 +7764,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "vpos = gl_FragCoord;\n"); - else if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + else if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); else @@ -8384,6 +8383,7 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ps_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; struct ps_np2fixup_info *np2fixup; @@ -8448,7 +8448,7 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, pixelshader_update_resource_types(shader, args->tex_types); string_buffer_clear(buffer); - ret = shader_glsl_generate_pshader(context, buffer, string_buffers, shader, args, np2fixup); + ret = shader_glsl_generate_fragment_shader(context_gl, buffer, string_buffers, shader, args, np2fixup); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret;

1 0

Alexandre Julliard : wsdapi: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: e005434d6e9c6f3f48f5f26db60ba46c10ba06af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e005434d6e9c6f3f48f5f26d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:43:58 2019 +0200 wsdapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index dd7b350..e63ea51 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -2,6 +2,8 @@ MODULE = wsdapi.dll IMPORTLIB = wsdapi IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ address.c \ discovery.c \

1 0

Józef Kucia : tests: Add bug_if() for VK_EXT_conditional_rendering radv bugs.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: vkd3d Branch: master Commit: 5243b8c3f61416b1a618cc8687307a6fb770f2b4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5243b8c3f61416b1a618cc8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:22 2019 +0200 tests: Add bug_if() for VK_EXT_conditional_rendering radv bugs. Radv executes vkCmdResolveImage() and clears conditionally. 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> --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e4daf5..5177607 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31010,6 +31010,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + bug_if(is_radv_device(context.device)) todo check_readback_data_uint(&rb, NULL, 0xffffffff, 0); release_resource_readback(&rb); @@ -31244,6 +31245,7 @@ static void test_conditional_rendering(void) D3D12_RESOURCE_STATE_RESOLVE_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(texture_copy, 0, &rb, queue, command_list); + bug_if(is_radv_device(context.device)) todo check_readback_data_uint(&rb, NULL, r8g8b8a8_data[1], 0); release_resource_readback(&rb);

1 0

Józef Kucia : tests: Remove tests for DXGI_FORMAT_B8G8R8A8_UNORM UAV support.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: vkd3d Branch: master Commit: 807315c20f9ff0d201f8f64c1cef64b0a5d84056 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=807315c20f9ff0d201f8f64… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:20 2019 +0200 tests: Remove tests for DXGI_FORMAT_B8G8R8A8_UNORM UAV support. UAV support for B8G8R8A8_UNORM appears to be present even on feature level 11_0 on newer Windows versions. 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> --- tests/d3d12.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5a870d9..1eec922 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1184,8 +1184,6 @@ static void test_format_support(void) /* A recent version of WARP suppots B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ {{DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, - {{DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, - D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, }; if (!(device = create_device())) @@ -1797,26 +1795,6 @@ static void test_create_committed_resource(void) &IID_ID3D12Resource, (void **)&resource); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* DXGI_FORMAT_B8G8R8A8_UNORM does not support D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS. */ - heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; - resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - resource_desc.Alignment = 0; - resource_desc.Width = 32; - resource_desc.Height = 32; - resource_desc.DepthOrArraySize = 1; - resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; - resource_desc.SampleDesc.Count = 1; - resource_desc.SampleDesc.Quality = 0; - resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; - resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS; - hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, - &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, - &IID_ID3D12Resource, (void **)&resource); - todo ok(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12Resource_Release(resource); - heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD; resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER;

1 0

Józef Kucia : tests: Add more tests for D3D12_FEATURE_FORMAT_INFO.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: vkd3d Branch: master Commit: 579abe987d1cc000c04b20d2f6e77646d993ec01 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=579abe987d1cc000c04b20d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:19 2019 +0200 tests: Add more tests for D3D12_FEATURE_FORMAT_INFO. 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> --- tests/d3d12.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c3931b9..5a870d9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -975,8 +975,11 @@ static void test_check_feature_support(void) D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; D3D12_FEATURE_DATA_FORMAT_INFO format_info; + unsigned int expected_plane_count; ID3D12Device *device; + DXGI_FORMAT format; ULONG refcount; + bool is_todo; HRESULT hr; static const D3D_FEATURE_LEVEL all_feature_levels[] = @@ -1096,21 +1099,58 @@ static void test_check_feature_support(void) ok(format_info.Format == DXGI_FORMAT_UNKNOWN, "Got unexpected format %#x.\n", format_info.Format); ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); - memset(&format_info, 0, sizeof(format_info)); - format_info.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, - &format_info, sizeof(format_info)); - ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); - ok(format_info.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected format %#x.\n", format_info.Format); - ok(format_info.PlaneCount == 1, "Got unexpected plane count %u.\n", format_info.PlaneCount); + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + vkd3d_test_set_context("format %#x", format); - memset(&format_info, 0, sizeof(format_info)); - format_info.Format = DXGI_FORMAT_R24G8_TYPELESS; - hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, - &format_info, sizeof(format_info)); - ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); - ok(format_info.Format == DXGI_FORMAT_R24G8_TYPELESS, "Got unexpected format %#x.\n", format_info.Format); - ok(format_info.PlaneCount == 2, "Got unexpected plane count %u.\n", format_info.PlaneCount); + switch (format) + { + case DXGI_FORMAT_R32G8X24_TYPELESS: + case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: + case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: + case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: + case DXGI_FORMAT_D24_UNORM_S8_UINT: + case DXGI_FORMAT_R24G8_TYPELESS: + case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: + case DXGI_FORMAT_X24_TYPELESS_G8_UINT: + case DXGI_FORMAT_NV12: + case DXGI_FORMAT_P010: + case DXGI_FORMAT_P016: + case DXGI_FORMAT_NV11: + expected_plane_count = 2; + break; + default: + expected_plane_count = 1; + break; + } + + is_todo = format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP + || format == DXGI_FORMAT_R8G8_B8G8_UNORM + || format == DXGI_FORMAT_G8R8_G8B8_UNORM + || format == DXGI_FORMAT_B5G6R5_UNORM + || format == DXGI_FORMAT_B5G5R5A1_UNORM + || format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM + || (DXGI_FORMAT_AYUV <= format && format <= DXGI_FORMAT_B4G4R4A4_UNORM); + + memset(&format_info, 0, sizeof(format_info)); + format_info.Format = format; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_INFO, + &format_info, sizeof(format_info)); + + if (format == DXGI_FORMAT_R1_UNORM) + { + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + continue; + } + + todo_if(is_todo) + ok(hr == S_OK, "Failed to get format info, hr %#x.\n", hr); + ok(format_info.Format == format, "Got unexpected format %#x.\n", format_info.Format); + todo_if(is_todo) + ok(format_info.PlaneCount == expected_plane_count, + "Got plane count %u, expected %u.\n", format_info.PlaneCount, expected_plane_count); + } + vkd3d_test_set_context(NULL); /* GPU virtual address */ memset(&gpu_virtual_address, 0, sizeof(gpu_virtual_address));

1 0

Józef Kucia : vkd3d: Implement D3D12_FEATURE_FORMAT_INFO.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: vkd3d Branch: master Commit: 69e73a6a8f9d30c46be1f3a8cb2875e607796852 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=69e73a6a8f9d30c46be1f3a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:18 2019 +0200 vkd3d: Implement D3D12_FEATURE_FORMAT_INFO. 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> --- libs/vkd3d/device.c | 31 ++++++++ libs/vkd3d/utils.c | 192 ++++++++++++++++++++++----------------------- libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 12 +-- 4 files changed, 134 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=69e73a6a8f9d30c46be…

1 0

Józef Kucia : tests: Add more tests for predicated rendering.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: vkd3d Branch: master Commit: aa341b42d76facbdc1f03b6a8f209e4f277e56ae URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa341b42d76facbdc1f03b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 27 14:26:21 2019 +0200 tests: Add more tests for predicated rendering. 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> --- tests/d3d12.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1eec922..2e4daf5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30883,6 +30883,7 @@ static void prepare_instanced_draw(struct test_context *context) static void test_conditional_rendering(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + ID3D12Resource *conditions, *upload_buffer; ID3D12CommandSignature *command_signature; ID3D12GraphicsCommandList *command_list; D3D12_ROOT_PARAMETER root_parameters[2]; @@ -30895,7 +30896,6 @@ static void test_conditional_rendering(void) struct test_context context; ID3D12Resource *buffer, *cb; struct resource_readback rb; - ID3D12Resource *conditions; ID3D12CommandQueue *queue; unsigned int i; uint32_t value; @@ -30976,7 +30976,7 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, @@ -30992,6 +30992,8 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_SetPredication(command_list, conditions, + sizeof(uint64_t), D3D12_PREDICATION_OP_EQUAL_ZERO); check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); reset_command_list(command_list, context.allocator); @@ -31099,6 +31101,26 @@ static void test_conditional_rendering(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* SetPredication() and upload buffer. */ + upload_buffer = create_upload_buffer(context.device, sizeof(predicate_args), predicate_args); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + prepare_instanced_draw(&context); + /* Skip. */ + ID3D12GraphicsCommandList_SetPredication(command_list, upload_buffer, + 0, D3D12_PREDICATION_OP_EQUAL_ZERO); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetPredication(command_list, upload_buffer, + 0, D3D12_PREDICATION_OP_NOT_EQUAL_ZERO); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + /* ExecuteIndirect(). */ buffer = create_upload_buffer(context.device, sizeof(draw_args), &draw_args); @@ -31300,6 +31322,7 @@ static void test_conditional_rendering(void) ID3D12Resource_Release(conditions); ID3D12Resource_Release(cb); ID3D12Resource_Release(buffer); + ID3D12Resource_Release(upload_buffer); ID3D12RootSignature_Release(root_signature); ID3D12PipelineState_Release(pipeline_state); destroy_test_context(&context);

1 0