- Wine-Commits - list.winehq.org

Conor McCarthy : tests/shader-runner: Add a test for a signed int structured buffer UAV.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: b447a725ecaa4cc17b1f3a8e6730ce4c5ee56cd4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b447a725ecaa4cc17b1f3a8e6730c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 12 11:44:36 2024 +1000 tests/shader-runner: Add a test for a signed int structured buffer UAV. Check for backend type mismatches resulting from the absence of signedness in SM 6. --- tests/hlsl/uav-rwstructuredbuffer.shader_test | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/hlsl/uav-rwstructuredbuffer.shader_test b/tests/hlsl/uav-rwstructuredbuffer.shader_test index bbe0ac95..93864f0f 100644 --- a/tests/hlsl/uav-rwstructuredbuffer.shader_test +++ b/tests/hlsl/uav-rwstructuredbuffer.shader_test @@ -135,3 +135,24 @@ float4 main() : sv_target u[0].x = float3(30.0, 40.0, 50.0); return 0; } + +[uav 2] +stride 16 +size (buffer, 2) + +1 2 3 4 5 6 7 8 + +[pixel shader todo] +RWStructuredBuffer<int4> u : register(u2); + +float4 main() : sv_target1 +{ + u[0] = int4(11, -12, 13, -14); + u[1] = int4(-15, 16, -17, 18); + return 0; +} + +[test] +todo draw quad +probe uav 2 (0) rgbai (11, -12, 13, -14) +probe uav 2 (1) rgbai (-15, 16, -17, 18)

1 0

Conor McCarthy : tests/shader-runner: Support structured buffer UAVs.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: vkd3d Branch: master Commit: 081c9dbc96bdc8f567489ecfdb76b0fccfe4a697 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/081c9dbc96bdc8f567489ecfdb76b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Feb 1 16:01:45 2024 +1000 tests/shader-runner: Support structured buffer UAVs. --- tests/hlsl/uav-rwstructuredbuffer.shader_test | 12 ++++++++++++ tests/shader_runner.c | 7 +++++++ tests/shader_runner.h | 1 + tests/shader_runner_d3d11.c | 17 +++++++++-------- tests/shader_runner_d3d12.c | 1 + tests/shader_runner_gl.c | 1 + tests/shader_runner_vulkan.c | 4 ++++ 7 files changed, 35 insertions(+), 8 deletions(-) diff --git a/tests/hlsl/uav-rwstructuredbuffer.shader_test b/tests/hlsl/uav-rwstructuredbuffer.shader_test index f962e18e..bbe0ac95 100644 --- a/tests/hlsl/uav-rwstructuredbuffer.shader_test +++ b/tests/hlsl/uav-rwstructuredbuffer.shader_test @@ -1,6 +1,12 @@ [require] shader model >= 5.0 +[uav 2] +stride 16 +size (buffer, 2) + +0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 + [pixel shader todo] struct s { @@ -22,9 +28,15 @@ RWStructuredBuffer<struct s2> u5; float4 main() : sv_target1 { u[0] = float4(11.1, 12.2, 13.3, 14.4); + u[1] = float4(15.5, 16.6, 17.7, 18.8); return 0; } +[test] +todo draw quad +probe uav 2 (0) rgba (11.1, 12.2, 13.3, 14.4) +probe uav 2 (1) rgba (15.5, 16.6, 17.7, 18.8) + [pixel shader todo] struct s { diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 85c88d7b..c20932cc 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -427,6 +427,13 @@ static void parse_resource_directive(struct resource_params *resource, const cha { resource->format = parse_format(line, &resource->data_type, &resource->texel_size, &line); } + else if (match_string(line, "stride", &line)) + { + if (sscanf(line, "%u", &resource->stride) < 1) + fatal_error("Malformed texture stride '%s'.\n", line); + resource->texel_size = resource->stride; + resource->format = DXGI_FORMAT_UNKNOWN; + } else if (match_string(line, "size", &line)) { if (sscanf(line, "( buffer , %u ) ", &resource->width) == 1) diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 5ad6a278..62358d78 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -87,6 +87,7 @@ struct resource_params DXGI_FORMAT format; enum texture_data_type data_type; unsigned int texel_size; + unsigned int stride; unsigned int width, height; unsigned int level_count; uint8_t *data; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 0d13fc00..528c04e9 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -330,7 +330,8 @@ static void destroy_test_context(struct d3d11_shader_runner *runner) ok(!ref, "Device has %lu references left.\n", ref); } -static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags, unsigned int size, const void *data) +static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags, unsigned int size, + unsigned int stride, const void *data) { D3D11_SUBRESOURCE_DATA resource_data; D3D11_BUFFER_DESC buffer_desc; @@ -341,8 +342,8 @@ static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags buffer_desc.Usage = D3D11_USAGE_DEFAULT; buffer_desc.BindFlags = bind_flags; buffer_desc.CPUAccessFlags = 0; - buffer_desc.MiscFlags = 0; - buffer_desc.StructureByteStride = 0; + buffer_desc.MiscFlags = stride ? D3D11_RESOURCE_MISC_BUFFER_STRUCTURED : 0; + buffer_desc.StructureByteStride = stride; resource_data.pSysMem = data; resource_data.SysMemPitch = 0; @@ -417,7 +418,7 @@ static void init_resource_srv_buffer(struct d3d11_shader_runner *runner, struct ID3D11Device *device = runner->device; HRESULT hr; - resource->buffer = create_buffer(device, D3D11_BIND_SHADER_RESOURCE, params->data_size, params->data); + resource->buffer = create_buffer(device, D3D11_BIND_SHADER_RESOURCE, params->data_size, params->stride, params->data); resource->resource = (ID3D11Resource *)resource->buffer; srv_desc.Format = params->format; @@ -435,7 +436,7 @@ static void init_resource_uav_buffer(struct d3d11_shader_runner *runner, struct ID3D11Device *device = runner->device; HRESULT hr; - resource->buffer = create_buffer(device, D3D11_BIND_UNORDERED_ACCESS, params->data_size, params->data); + resource->buffer = create_buffer(device, D3D11_BIND_UNORDERED_ACCESS, params->data_size, params->stride, params->data); resource->resource = (ID3D11Resource *)resource->buffer; uav_desc.Format = params->format; @@ -474,7 +475,7 @@ static struct resource *d3d11_runner_create_resource(struct shader_runner *r, co break; case RESOURCE_TYPE_VERTEX_BUFFER: - resource->buffer = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, params->data_size, params->data); + resource->buffer = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, params->data_size, params->stride, params->data); resource->resource = (ID3D11Resource *)resource->buffer; break; } @@ -538,7 +539,7 @@ static bool d3d11_runner_dispatch(struct shader_runner *r, unsigned int x, unsig ID3D11Buffer *cb; cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, - runner->r.uniform_count * sizeof(*runner->r.uniforms), runner->r.uniforms); + runner->r.uniform_count * sizeof(*runner->r.uniforms), 0, runner->r.uniforms); ID3D11DeviceContext_CSSetConstantBuffers(context, 0, 1, &cb); ID3D11Buffer_Release(cb); } @@ -618,7 +619,7 @@ static bool d3d11_runner_draw(struct shader_runner *r, if (runner->r.uniform_count) { cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, - runner->r.uniform_count * sizeof(*runner->r.uniforms), runner->r.uniforms); + runner->r.uniform_count * sizeof(*runner->r.uniforms), 0, runner->r.uniforms); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); } diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index b7a29431..ca137512 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -200,6 +200,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co uav_desc.Format = params->format; uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; uav_desc.Buffer.NumElements = params->width * params->height; + uav_desc.Buffer.StructureByteStride = params->stride; ID3D12Device_CreateUnorderedAccessView(device, resource->resource, NULL, &uav_desc, get_cpu_descriptor_handle(test_context, runner->heap, resource->r.slot + MAX_RESOURCES)); diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index f4e4fa75..263d1ba7 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -290,6 +290,7 @@ static const struct format_info *get_format_info(enum DXGI_FORMAT format) static const struct format_info format_info[] = { + {DXGI_FORMAT_UNKNOWN, 1, true, GL_R32UI, GL_RED_INTEGER, GL_UNSIGNED_INT}, {DXGI_FORMAT_R32G32B32A32_FLOAT, 4, false, GL_RGBA32F, GL_RGBA, GL_FLOAT}, {DXGI_FORMAT_R32G32B32A32_UINT, 4, true, GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT}, {DXGI_FORMAT_R32G32_FLOAT, 2, false, GL_RG32F, GL_RG, GL_FLOAT}, diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index f9ab204f..35db729b 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -330,6 +330,10 @@ static void resource_init_buffer(struct vulkan_shader_runner *runner, struct vul else usage = VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + /* d3d12 requires DXGI_FORMAT_UNKNOWN for structured buffers, but Vulkan requires a defined format. */ + if (format == VK_FORMAT_UNDEFINED && params->stride) + format = VK_FORMAT_R32_UINT; + resource->buffer = create_buffer(runner, params->data_size, usage, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &resource->memory); resource->buffer_view = create_buffer_view(runner, resource->buffer, format);

1 0

Alex Henrie : include: Add debugstr_time to wine/strmbase.h.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 2e9a57a0b823140f8cf514ac7bf8812b0f15f15d URL: https://gitlab.winehq.org/wine/wine/-/commit/2e9a57a0b823140f8cf514ac7bf881… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 17 23:11:27 2024 -0700 include: Add debugstr_time to wine/strmbase.h. --- dlls/evr/evr_private.h | 21 --------------------- dlls/qasf/asfreader.c | 21 --------------------- dlls/quartz/quartz_private.h | 21 --------------------- dlls/winegstreamer/gst_private.h | 21 --------------------- include/wine/strmbase.h | 22 ++++++++++++++++++++++ libs/strmbase/strmbase_private.h | 21 --------------------- 6 files changed, 22 insertions(+), 105 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 225e60348b4..c24dd01a745 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -24,27 +24,6 @@ #include "wine/strmbase.h" #include "wine/debug.h" -static inline const char *debugstr_time(LONGLONG time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect) { if (!rect) return "(null)"; diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 4cf077e9dd3..7a832e9a718 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -27,27 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -static inline const char *debugstr_time(REFERENCE_TIME time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - struct buffer { INSSBuffer INSSBuffer_iface; diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 8a761e540b9..946709f936a 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -44,27 +44,6 @@ 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; -static inline const char *debugstr_time(REFERENCE_TIME time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - /* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 5e6cbbab5d5..2374fb6fddd 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -41,27 +41,6 @@ bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size); -static inline const char *debugstr_time(REFERENCE_TIME time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) struct wg_sample_queue; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 1b4cc3f7657..978d1c67160 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -20,6 +20,7 @@ */ #include "dshow.h" +#include "wine/debug.h" HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE * pDest, const AM_MEDIA_TYPE *pSrc); void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType); @@ -28,6 +29,27 @@ void WINAPI DeleteMediaType(AM_MEDIA_TYPE * pMediaType); void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt); +static inline const char *debugstr_time(REFERENCE_TIME time) +{ + ULONGLONG abstime = time >= 0 ? time : -time; + unsigned int i = 0, j = 0; + char buffer[23], rev[23]; + + while (abstime || i <= 8) + { + buffer[i++] = '0' + (abstime % 10); + abstime /= 10; + if (i == 7) buffer[i++] = '.'; + } + if (time < 0) buffer[i++] = '-'; + + while (i--) rev[j++] = buffer[i]; + while (rev[j-1] == '0' && rev[j-2] != '.') --j; + rev[j] = 0; + + return wine_dbg_sprintf("%s", rev); +} + /* Pin functions */ struct strmbase_pin diff --git a/libs/strmbase/strmbase_private.h b/libs/strmbase/strmbase_private.h index cf702a279c2..374b10e7d51 100644 --- a/libs/strmbase/strmbase_private.h +++ b/libs/strmbase/strmbase_private.h @@ -30,25 +30,4 @@ #include "wine/list.h" #include "wine/strmbase.h" -static inline const char *debugstr_time(REFERENCE_TIME time) -{ - ULONGLONG abstime = time >= 0 ? time : -time; - unsigned int i = 0, j = 0; - char buffer[23], rev[23]; - - while (abstime || i <= 8) - { - buffer[i++] = '0' + (abstime % 10); - abstime /= 10; - if (i == 7) buffer[i++] = '.'; - } - if (time < 0) buffer[i++] = '-'; - - while (i--) rev[j++] = buffer[i]; - while (rev[j-1] == '0' && rev[j-2] != '.') --j; - rev[j] = 0; - - return wine_dbg_sprintf("%s", rev); -} - #endif /* __WINE_STRMBASE_PRIVATE_H */

1 0

Petrichor Park : vkd3d-shader/hlsl: Implement atan and atan2.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: vkd3d Branch: master Commit: 02a366782263f6eb06b8cd839113dff308f2cf05 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/02a366782263f6eb06b8cd839113d… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Sun Feb 11 11:06:24 2024 -0600 vkd3d-shader/hlsl: Implement atan and atan2. Also narrows some more todos on the tests. --- libs/vkd3d-shader/hlsl.y | 95 +++++++++++++++++++++++++++++++++++++ tests/hlsl/inverse-trig.shader_test | 44 ++++++++--------- 2 files changed, 117 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 111fec17..b59dbf32 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2798,6 +2798,99 @@ static bool intrinsic_asin(struct hlsl_ctx *ctx, return write_acos_or_asin(ctx, params, loc, true); } +static bool write_atan_or_atan2(struct hlsl_ctx *ctx, + const struct parse_initializer *params, + const struct vkd3d_shader_location *loc, bool atan2_mode) +{ + struct hlsl_ir_function_decl *func; + struct hlsl_type *type; + struct vkd3d_string_buffer *buf; + int ret; + + static const char atan2_name[] = "atan2"; + static const char atan_name[] = "atan"; + + static const char atan2_header_template[] = + "%s atan2(%s y, %s x)\n" + "{\n" + " %s in_y, in_x;\n" + " in_y = y;\n" + " in_x = x;\n"; + static const char atan_header_template[] = + "%s atan(%s y)\n" + "{\n" + " %s in_y, in_x;\n" + " in_y = y;\n" + " in_x = 1.0;\n"; + + static const char body_template[] = + " %s recip, input, x2, poly_approx, flipped;" + " recip = 1.0 / max(abs(in_y), abs(in_x));\n" + " input = recip * min(abs(in_y), abs(in_x));\n" + " x2 = input * input;\n" + " poly_approx = ((((0.020835\n" + " * x2 - 0.085133)\n" + " * x2 + 0.180141)\n" + " * x2 - 0.330299)\n" + " * x2 + 0.999866)\n" + " * input;\n" + " flipped = poly_approx * -2.0 + 1.570796;\n" + " poly_approx += abs(in_x) < abs(in_y) ? flipped : 0.0;\n" + " poly_approx += in_x < 0.0 ? -3.1415927 : 0.0;\n" + " return (min(in_x, in_y) < 0.0 && max(in_x, in_y) >= 0.0)\n" + " ? -poly_approx\n" + " : poly_approx;\n" + "}"; + + if (!(type = elementwise_intrinsic_get_common_type(ctx, params, loc))) + return false; + type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + + if (!(buf = hlsl_get_string_buffer(ctx))) + return false; + + if (atan2_mode) + ret = vkd3d_string_buffer_printf(buf, atan2_header_template, + type->name, type->name, type->name, type->name); + else + ret = vkd3d_string_buffer_printf(buf, atan_header_template, + type->name, type->name, type->name); + if (ret < 0) + { + vkd3d_string_buffer_cleanup(buf); + return false; + } + + ret = vkd3d_string_buffer_printf(buf, body_template, type->name); + if (ret < 0) + { + vkd3d_string_buffer_cleanup(buf); + return false; + } + + func = hlsl_compile_internal_function(ctx, + atan2_mode ? atan2_name : atan_name, buf->buffer); + vkd3d_string_buffer_cleanup(buf); + if (!func) + return false; + + return add_user_call(ctx, func, params, loc); +} + +static bool intrinsic_atan(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return write_atan_or_atan2(ctx, params, loc, false); +} + + +static bool intrinsic_atan2(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return write_atan_or_atan2(ctx, params, loc, true); +} + + /* Find the type corresponding to the given source type, with the same * dimensions but a different base type. */ static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx, @@ -4031,6 +4124,8 @@ intrinsic_functions[] = {"asfloat", 1, true, intrinsic_asfloat}, {"asin", 1, true, intrinsic_asin}, {"asuint", -1, true, intrinsic_asuint}, + {"atan", 1, true, intrinsic_atan}, + {"atan2", 2, true, intrinsic_atan2}, {"ceil", 1, true, intrinsic_ceil}, {"clamp", 3, true, intrinsic_clamp}, {"clip", 1, true, intrinsic_clip}, diff --git a/tests/hlsl/inverse-trig.shader_test b/tests/hlsl/inverse-trig.shader_test index 01344204..e428d309 100644 --- a/tests/hlsl/inverse-trig.shader_test +++ b/tests/hlsl/inverse-trig.shader_test @@ -92,7 +92,7 @@ todo(sm<4) draw quad probe all rgba (31416.0, 0.0, 0.0, 0.0) -[pixel shader todo] +[pixel shader todo(sm<4)] uniform float4 a; float4 main() : sv_target @@ -102,26 +102,26 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (-0.785409629, 0.0, 0.0, 0.0) 512 uniform 0 float4 -0.5 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (-0.4636476, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.5 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (0.4636476, 0.0, 0.0, 0.0) 256 uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (0.785409629, 0.0, 0.0, 0.0) 512 -[pixel shader todo] +[pixel shader todo(sm<4)] uniform float4 a; float4 main() : sv_target @@ -133,64 +133,64 @@ float4 main() : sv_target [test] % Non-degenerate cases uniform 0 float4 1.0 1.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (0.785385, 0.0, 0.0, 0.0) 512 uniform 0 float4 5.0 -5.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (2.356194, 0.0, 0.0, 0.0) 256 uniform 0 float4 -3.0 -3.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (-2.356194, 0.0, 0.0, 0.0) 256 uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 -1.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (-1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 1.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 -1.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256 % Degenerate cases uniform 0 float4 0.00001 0.00002 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (0.463647, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.00001 -0.00002 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (2.677945, 0.0, 0.0, 0.0) 256 uniform 0 float4 -0.00001 100000.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (-0.000000000099986595, 0.0, 0.0, 0.0) 2048 uniform 0 float4 10000000.0 0.00000001 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 % Negative zero behavior should be to treat it the % same as normal zero. uniform 0 float4 1000000000.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 1000000000.0 -0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (1.570796, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 -1.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256 uniform 0 float4 -0.0 -1.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (3.1415927, 0.0, 0.0, 0.0) 256

1 0

Henri Verbeet : ci: Enable colour output for the tests.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: vkd3d Branch: master Commit: edc8e38bd9755361e9394703f0c3fd53661d2e83 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/edc8e38bd9755361e9394703f0c3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 21 12:01:04 2024 +0100 ci: Enable colour output for the tests. Autodetection doesn't work, but gitlab does in fact support colour output. Perhaps more importantly, the "Scroll to next failure" feature essentially scans the output for red text. --- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/build-linux b/gitlab/build-linux index a68a36b5..a060eadc 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -14,7 +14,7 @@ cd build export LD_LIBRARY_PATH=/usr/local/lib if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ make -j$(nproc) ; then - make -j$(nproc) check || \ + make -j$(nproc) AM_COLOR_TESTS=always check || \ touch ../tests_failed else touch ../build_failed diff --git a/gitlab/build-mac b/gitlab/build-mac index 3225c8a0..a3119686 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -13,7 +13,7 @@ mkdir build cd build if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Werror" && \ make -j$(sysctl -n hw.ncpu) ; then - make -j$(sysctl -n hw.ncpu) check || \ + make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \ touch ../tests_failed else touch ../build_failed

1 0

Petrichor Park : vkd3d-shader/hlsl: Implement acos and asin trig intrinsics.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: vkd3d Branch: master Commit: 69294c290bad83470e55046f02e2d1c6167150cb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/69294c290bad83470e55046f02e2d… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Sun Feb 11 11:06:01 2024 -0600 vkd3d-shader/hlsl: Implement acos and asin trig intrinsics. Tests have already been implemented in 92044d5e; this commit also reduces the scope of some of the todos (because now they're implemented!). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55154 --- libs/vkd3d-shader/hlsl.y | 57 +++++++++++++++++++++++++++++++++++++ tests/hlsl/inverse-trig.shader_test | 24 ++++++++-------- 2 files changed, 69 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index dc7b4c1b..111fec17 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2666,6 +2666,55 @@ static bool intrinsic_abs(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ABS, params->args[0], loc); } +static bool write_acos_or_asin(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc, bool asin_mode) +{ + struct hlsl_ir_function_decl *func; + struct hlsl_type *type; + char *body; + + static const char template[] = + "%s %s(%s x)\n" + "{\n" + " %s abs_arg = abs(x);\n" + " %s poly_approx = (((-0.018729\n" + " * abs_arg + 0.074261)\n" + " * abs_arg - 0.212114)\n" + " * abs_arg + 1.570729);\n" + " %s correction = sqrt(1.0 - abs_arg);\n" + " %s zero_flip = (x < 0.0) * (-2.0 * correction * poly_approx + 3.141593);\n" + " %s result = poly_approx * correction + zero_flip;\n" + " return %s;\n" + "}"; + static const char fn_name_acos[] = "acos"; + static const char fn_name_asin[] = "asin"; + static const char return_stmt_acos[] = "result"; + static const char return_stmt_asin[] = "-result + 1.570796"; + + const char *fn_name = asin_mode ? fn_name_asin : fn_name_acos; + + type = params->args[0]->data_type; + type = hlsl_get_numeric_type(ctx, type->class, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + + if (!(body = hlsl_sprintf_alloc(ctx, template, + type->name, fn_name, type->name, + type->name, type->name, type->name, type->name, type->name, + (asin_mode ? return_stmt_asin : return_stmt_acos)))) + return false; + func = hlsl_compile_internal_function(ctx, fn_name, body); + vkd3d_free(body); + if (!func) + return false; + + return add_user_call(ctx, func, params, loc); +} + +static bool intrinsic_acos(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return write_acos_or_asin(ctx, params, loc, false); +} + static bool intrinsic_all(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2743,6 +2792,12 @@ static bool intrinsic_any(struct hlsl_ctx *ctx, return false; } +static bool intrinsic_asin(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + return write_acos_or_asin(ctx, params, loc, true); +} + /* Find the type corresponding to the given source type, with the same * dimensions but a different base type. */ static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx, @@ -3970,9 +4025,11 @@ intrinsic_functions[] = /* Note: these entries should be kept in alphabetical order. */ {"D3DCOLORtoUBYTE4", 1, true, intrinsic_d3dcolor_to_ubyte4}, {"abs", 1, true, intrinsic_abs}, + {"acos", 1, true, intrinsic_acos}, {"all", 1, true, intrinsic_all}, {"any", 1, true, intrinsic_any}, {"asfloat", 1, true, intrinsic_asfloat}, + {"asin", 1, true, intrinsic_asin}, {"asuint", -1, true, intrinsic_asuint}, {"ceil", 1, true, intrinsic_ceil}, {"clamp", 3, true, intrinsic_clamp}, diff --git a/tests/hlsl/inverse-trig.shader_test b/tests/hlsl/inverse-trig.shader_test index 0c1fdc01..01344204 100644 --- a/tests/hlsl/inverse-trig.shader_test +++ b/tests/hlsl/inverse-trig.shader_test @@ -3,7 +3,7 @@ % implementations. DXIL defines intrinsics for inverse trig, to be implemented % by the backend. -[pixel shader todo] +[pixel shader todo(sm<4)] uniform float4 a; float4 main() : sv_target @@ -13,26 +13,26 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (3.14159274, 0.0, 0.0, 0.0) 128 uniform 0 float4 -0.5 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (2.094441441, 0.0, 0.0, 0.0) 256 uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (1.57072878, 0.0, 0.0, 0.0) 1024 uniform 0 float4 0.5 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (1.04715133, 0.0, 0.0, 0.0) 512 uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) 128 -[pixel shader todo] +[pixel shader todo(sm<4)] uniform float4 a; float4 main() : sv_target @@ -44,7 +44,7 @@ float4 main() : sv_target [test] uniform 0 float4 -1.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (-31416.0, 0.0, 0.0, 0.0) [require] @@ -52,15 +52,15 @@ shader model < 6.0 [test] uniform 0 float4 -0.5 0.0 0.0 0.0 -todo draw quad +todo(sm<4) draw quad probe all rgba (-10473.0, 0.0, 0.0, 0.0) uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad +todo(sm<4) draw quad probe all rgba (1.0, 0.0, 0.0, 0.0) uniform 0 float4 0.5 0.0 0.0 0.0 -todo draw quad +todo(sm<4) draw quad probe all rgba (10473.0, 0.0, 0.0, 0.0) [require] @@ -88,7 +88,7 @@ probe all rgba (10472.0, 0.0, 0.0, 0.0) 4096 [test] uniform 0 float4 1.0 0.0 0.0 0.0 -todo(sm<6) draw quad +todo(sm<4) draw quad probe all rgba (31416.0, 0.0, 0.0, 0.0)

1 0

Henri Verbeet : vkd3d-shader/hlsl: Replace HLSL_MODIFIER_RASTERIZER_ORDERED with a hlsl_type.e.resource flag.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: vkd3d Branch: master Commit: d4223a03c854743c6be0b2839eb91e9a8bb3c709 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d4223a03c854743c6be0b2839eb91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 19 12:52:31 2024 +0100 vkd3d-shader/hlsl: Replace HLSL_MODIFIER_RASTERIZER_ORDERED with a hlsl_type.e.resource flag. --- libs/vkd3d-shader/hlsl.c | 11 ++++++++--- libs/vkd3d-shader/hlsl.h | 9 +++++---- libs/vkd3d-shader/hlsl.y | 4 ++-- libs/vkd3d-shader/tpf.c | 6 +++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 60ed77ab..353e34d2 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -758,8 +758,8 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ return type; } -struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, - enum hlsl_sampler_dim dim, struct hlsl_type *format, uint32_t modifiers) +struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, + struct hlsl_type *format, bool rasteriser_ordered) { struct hlsl_type *type; @@ -770,8 +770,8 @@ struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, type->dimx = format->dimx; type->dimy = 1; type->sampler_dim = dim; - type->modifiers = modifiers; type->e.resource.format = format; + type->e.resource.rasteriser_ordered = rasteriser_ordered; hlsl_type_calculate_reg_size(ctx, type); list_add_tail(&ctx->types, &type->entry); return type; @@ -890,6 +890,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC && !hlsl_types_are_equal(t1->e.resource.format, t2->e.resource.format)) return false; + if (t1->base_type == HLSL_TYPE_UAV && t1->e.resource.rasteriser_ordered != t2->e.resource.rasteriser_ordered) + return false; } if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -1009,7 +1011,10 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, if (type->base_type == HLSL_TYPE_TECHNIQUE) type->e.version = old->e.version; if (old->base_type == HLSL_TYPE_TEXTURE || old->base_type == HLSL_TYPE_UAV) + { type->e.resource.format = old->e.resource.format; + type->e.resource.rasteriser_ordered = old->e.resource.rasteriser_ordered; + } break; default: diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 5deac632..5b73857b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -200,6 +200,8 @@ struct hlsl_type { /* Format of the data contained within the type. */ struct hlsl_type *format; + /* The type is a rasteriser-ordered view. */ + bool rasteriser_ordered; } resource; /* Additional field to distinguish object types. Currently used only for technique types. */ unsigned int version; @@ -370,11 +372,10 @@ struct hlsl_attribute #define HLSL_STORAGE_CENTROID 0x00004000 #define HLSL_STORAGE_NOPERSPECTIVE 0x00008000 #define HLSL_STORAGE_LINEAR 0x00010000 -#define HLSL_MODIFIER_RASTERIZER_ORDERED 0x00020000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ - HLSL_MODIFIER_COLUMN_MAJOR | HLSL_MODIFIER_RASTERIZER_ORDERED) + HLSL_MODIFIER_COLUMN_MAJOR) #define HLSL_INTERPOLATION_MODIFIERS_MASK (HLSL_STORAGE_NOINTERPOLATION | HLSL_STORAGE_CENTROID | \ HLSL_STORAGE_NOPERSPECTIVE | HLSL_STORAGE_LINEAR) @@ -1282,8 +1283,8 @@ struct hlsl_ir_var *hlsl_new_synthetic_var_named(struct hlsl_ctx *ctx, const cha struct hlsl_type *type, const struct vkd3d_shader_location *loc, bool dummy_scope); struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format, unsigned int sample_count); -struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, - enum hlsl_sampler_dim dim, struct hlsl_type *format, uint32_t modifiers); +struct hlsl_type *hlsl_new_uav_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, + struct hlsl_type *format, bool rasteriser_ordered); struct hlsl_ir_node *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location *loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5a5f77ed..dc7b4c1b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6263,12 +6263,12 @@ type_no_void: | uav_type '<' type '>' { validate_uav_type(ctx, $1, $3, &@3); - $$ = hlsl_new_uav_type(ctx, $1, $3, 0); + $$ = hlsl_new_uav_type(ctx, $1, $3, false); } | rov_type '<' type '>' { validate_uav_type(ctx, $1, $3, &@3); - $$ = hlsl_new_uav_type(ctx, $1, $3, HLSL_MODIFIER_RASTERIZER_ORDERED); + $$ = hlsl_new_uav_type(ctx, $1, $3, true); } | TYPE_IDENTIFIER { diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 6561f1fb..10dde985 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4259,6 +4259,9 @@ static void write_sm4_dcl_textures(const struct tpf_writer *tpf, const struct ex instr.opcode = VKD3D_SM5_OP_DCL_UAV_TYPED; break; } + + if (resource->data_type->e.resource.rasteriser_ordered) + instr.opcode |= VKD3DSUF_RASTERISER_ORDERED_VIEW << VKD3D_SM5_UAV_FLAGS_SHIFT; } else { @@ -4272,9 +4275,6 @@ static void write_sm4_dcl_textures(const struct tpf_writer *tpf, const struct ex instr.extra_bits |= component_type->sample_count << VKD3D_SM4_RESOURCE_SAMPLE_COUNT_SHIFT; } - if (resource->data_type->modifiers & HLSL_MODIFIER_RASTERIZER_ORDERED) - instr.opcode |= VKD3DSUF_RASTERISER_ORDERED_VIEW << VKD3D_SM5_UAV_FLAGS_SHIFT; - write_sm4_instruction(tpf, &instr); } }

1 0

Henri Verbeet : vkd3d-shader/hlsl: Introduce hlsl_type.e.resource.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: vkd3d Branch: master Commit: 49d14613a50d02abb9a03cc68c77409cc4d84ff2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/49d14613a50d02abb9a03cc68c774… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 19 13:57:54 2024 +0100 vkd3d-shader/hlsl: Introduce hlsl_type.e.resource. --- libs/vkd3d-shader/hlsl.c | 16 ++++++++-------- libs/vkd3d-shader/hlsl.h | 10 +++++++--- libs/vkd3d-shader/hlsl.y | 16 ++++++++-------- libs/vkd3d-shader/hlsl_codegen.c | 2 +- libs/vkd3d-shader/tpf.c | 6 +++--- 5 files changed, 27 insertions(+), 23 deletions(-)

1 0

Rémi Bernon : winevulkan: Handle invalid window in vkCreateSwapchainKHR.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: 9a1362695b9ca08885ce68fd867cd2e129473d52 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a1362695b9ca08885ce68fd867cd2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 25 01:44:49 2023 +0100 winevulkan: Handle invalid window in vkCreateSwapchainKHR. --- dlls/vulkan-1/tests/vulkan.c | 2 -- dlls/winevulkan/vulkan.c | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index e2ab609925b..371aef14255 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -858,7 +858,6 @@ static void test_win32_surface(VkInstance instance, VkPhysicalDevice physical_de swapchain = 0xdeadbeef; vr = create_swapchain(physical_device, surface, device, NULL, &swapchain); - todo_wine ok(vr == VK_ERROR_INITIALIZATION_FAILED /* Nvidia */ || vr == VK_SUCCESS /* AMD */, "Got unexpected vr %d.\n", vr); if (vr == VK_SUCCESS) @@ -928,7 +927,6 @@ static void test_win32_surface(VkInstance instance, VkPhysicalDevice physical_de swapchain = 0xdeadbeef; vr = create_swapchain(physical_device, surface, device, hwnd, &swapchain); - todo_wine ok(vr == VK_ERROR_INITIALIZATION_FAILED /* Nvidia */ || vr == VK_SUCCESS /* AMD */, "Got unexpected vr %d.\n", vr); if (vr == VK_SUCCESS) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 5d9d9e452b8..045f984731e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1570,6 +1570,12 @@ VkResult wine_vkCreateSwapchainKHR(VkDevice device_handle, const VkSwapchainCrea VkSurfaceCapabilitiesKHR capabilities; VkResult res; + if (!NtUserIsWindow(surface->hwnd)) + { + ERR("surface %p, hwnd %p is invalid!\n", surface, surface->hwnd); + return VK_ERROR_INITIALIZATION_FAILED; + } + if (surface) create_info_host.surface = surface->driver_surface; if (old_swapchain) create_info_host.oldSwapchain = old_swapchain->host_swapchain;

1 0

Rémi Bernon : winevulkan: Handle invalid window in vkGetPhysicalDevicePresentRectanglesKHR.
by Alexandre Julliard Feb. 21, 2024

Feb. 21, 2024

Module: wine Branch: master Commit: b541b9661a2f10ace004a5384976ba29e5c0da03 URL: https://gitlab.winehq.org/wine/wine/-/commit/b541b9661a2f10ace004a5384976ba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 10:30:49 2023 +0100 winevulkan: Handle invalid window in vkGetPhysicalDevicePresentRectanglesKHR. --- dlls/vulkan-1/tests/vulkan.c | 6 +----- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 19 +++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winevulkan/vulkan_thunks.h | 1 + 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 371aef14255..716a524e796 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -656,14 +656,10 @@ static void test_win32_surface_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_ if (IsWindow(hwnd)) ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); else - { - todo_wine ok(vr == VK_SUCCESS /* Nvidia */ || vr == VK_ERROR_UNKNOWN /* AMD */, "Got unexpected vr %d.\n", vr); - } memset(&rect, 0xcc, sizeof(rect)); vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, &rect); - todo_wine_if(!IsWindow(hwnd)) ok(vr == VK_SUCCESS /* Nvidia */ || vr == VK_ERROR_UNKNOWN /* AMD */, "Got unexpected vr %d.\n", vr); if (vr == VK_SUCCESS) { @@ -676,7 +672,7 @@ static void test_win32_surface_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_ }; ok(count == 1, "Got unexpected count %u.\n", count); - todo_wine_if(IsRectEmpty(&client_rect)) + todo_wine_if(IsWindow(hwnd) && IsRectEmpty(&client_rect)) ok(EqualRect(&tmp_rect, &client_rect), "Got unexpected rect %s.\n", wine_dbgstr_rect(&tmp_rect)); } diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c98ce300be6..0030f6243d0 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -259,6 +259,7 @@ MANUAL_UNIX_THUNKS = { "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR", "vkGetPhysicalDeviceImageFormatProperties2", "vkGetPhysicalDeviceImageFormatProperties2KHR", + "vkGetPhysicalDevicePresentRectanglesKHR", "vkGetPhysicalDeviceSurfaceCapabilities2KHR", "vkGetPhysicalDeviceSurfaceCapabilitiesKHR", "vkMapMemory", diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 045f984731e..8531fc82ddd 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1920,6 +1920,25 @@ VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice device return res; } +VkResult wine_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice device_handle, VkSurfaceKHR surface_handle, + uint32_t *rect_count, VkRect2D *rects) +{ + struct wine_phys_dev *physical_device = wine_phys_dev_from_handle(device_handle); + struct wine_surface *surface = wine_surface_from_handle(surface_handle); + struct wine_instance *instance = physical_device->instance; + + if (!NtUserIsWindow(surface->hwnd)) + { + if (rects && !*rect_count) return VK_INCOMPLETE; + if (rects) memset(rects, 0, sizeof(VkRect2D)); + *rect_count = 1; + return VK_SUCCESS; + } + + return instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(physical_device->host_physical_device, + surface->driver_surface, rect_count, rects); +} + VkResult wine_vkCreateDebugUtilsMessengerEXT(VkInstance handle, const VkDebugUtilsMessengerCreateInfoEXT *create_info, const VkAllocationCallbacks *allocator, diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index ce61f5cc9cf..3667fc51d90 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -43065,7 +43065,7 @@ static NTSTATUS thunk64_vkGetPhysicalDevicePresentRectanglesKHR(void *args) TRACE("%p, 0x%s, %p, %p\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects); - params->result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle(params->physicalDevice)->host_physical_device, wine_surface_from_handle(params->surface)->driver_surface, params->pRectCount, params->pRects); + params->result = wine_vkGetPhysicalDevicePresentRectanglesKHR(params->physicalDevice, params->surface, params->pRectCount, params->pRects); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -43083,7 +43083,7 @@ static NTSTATUS thunk32_vkGetPhysicalDevicePresentRectanglesKHR(void *args) TRACE("%#x, 0x%s, %#x, %#x\n", params->physicalDevice, wine_dbgstr_longlong(params->surface), params->pRectCount, params->pRects); - params->result = wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->funcs.p_vkGetPhysicalDevicePresentRectanglesKHR(wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->host_physical_device, wine_surface_from_handle(params->surface)->driver_surface, (uint32_t *)UlongToPtr(params->pRectCount), (VkRect2D *)UlongToPtr(params->pRects)); + params->result = wine_vkGetPhysicalDevicePresentRectanglesKHR((VkPhysicalDevice)UlongToPtr(params->physicalDevice), params->surface, (uint32_t *)UlongToPtr(params->pRectCount), (VkRect2D *)UlongToPtr(params->pRects)); return STATUS_SUCCESS; } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 2c2712291c1..28a8d8a0090 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -58,6 +58,7 @@ void wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice physic void wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties); VkResult wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties); VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties); +VkResult wine_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pRectCount, VkRect2D *pRects); VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); VkResult wine_vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData);

1 0