February 2022 - Wine-devel - list.winehq.org

[PATCH v2 3/3] winhttp: Support receiving web socket buffer fragments.
by Hans Leidekker 28 Feb '22

28 Feb '22

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 66 +++++++++++++++++++++++++++++----- dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 48e25023d07..b409c4cdced 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3550,6 +3550,7 @@ static BOOL is_supported_opcode( enum socket_opcode opcode ) { switch (opcode) { + case SOCKET_OPCODE_CONTINUE: case SOCKET_OPCODE_TEXT: case SOCKET_OPCODE_BINARY: case SOCKET_OPCODE_CLOSE: @@ -3562,7 +3563,7 @@ static BOOL is_supported_opcode( enum socket_opcode opcode ) } } -static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_opcode *opcode ) +static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_opcode *opcode, BOOL *final ) { DWORD ret, len, count; char hdr[2]; @@ -3573,7 +3574,8 @@ static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_o return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } *opcode = hdr[0] & 0xf; - TRACE("received %02x frame\n", *opcode); + *final = hdr[0] & FIN_BIT; + TRACE("received %02x frame, final %#x\n", *opcode, *final); len = hdr[1] & ~MASK_BIT; if (len == 126) @@ -3720,18 +3722,49 @@ static DWORD handle_control_frame( struct socket *socket ) return ERROR_SUCCESS; } -static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOOL fragment ) +static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( struct socket *socket, enum socket_opcode opcode, BOOL fragment ) { + enum fragment_type frag_type = socket->receiving_fragment_type; + switch (opcode) { case SOCKET_OPCODE_TEXT: - if (fragment) return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + if (frag_type && frag_type != SOCKET_FRAGMENT_UTF8) + FIXME( "Received SOCKET_OPCODE_TEXT with prev fragment %u.\n", frag_type ); + if (fragment) + { + socket->receiving_fragment_type = SOCKET_FRAGMENT_UTF8; + return WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + } + socket->receiving_fragment_type = SOCKET_FRAGMENT_NONE; return WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; case SOCKET_OPCODE_BINARY: - if (fragment) return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + if (frag_type && frag_type != SOCKET_FRAGMENT_BINARY) + FIXME( "Received SOCKET_OPCODE_BINARY with prev fragment %u.\n", frag_type ); + if (fragment) + { + socket->receiving_fragment_type = SOCKET_FRAGMENT_BINARY; + return WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + } + socket->receiving_fragment_type = SOCKET_FRAGMENT_NONE; return WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE; + case SOCKET_OPCODE_CONTINUE: + if (!frag_type) + { + FIXME( "Received SOCKET_OPCODE_CONTINUE without starting fragment.\n" ); + return ~0u; + } + if (fragment) + { + return frag_type == SOCKET_FRAGMENT_BINARY ? WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE + : WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + } + socket->receiving_fragment_type = SOCKET_FRAGMENT_NONE; + return frag_type == SOCKET_FRAGMENT_BINARY ? WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE + : WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE; + case SOCKET_OPCODE_CLOSE: return WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE; @@ -3744,13 +3777,14 @@ static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOO static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type ) { + BOOL final = socket->last_receive_final; DWORD count, ret = ERROR_SUCCESS; if (!socket->read_size) { for (;;) { - if (!(ret = receive_frame( socket, &socket->read_size, &socket->opcode ))) + if (!(ret = receive_frame( socket, &socket->read_size, &socket->opcode, &final ))) { if (!(socket->opcode & CONTROL_BIT) || (ret = handle_control_frame( socket )) || socket->opcode == SOCKET_OPCODE_CLOSE) break; @@ -3759,7 +3793,11 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD if (ret) break; } } - if (!ret) ret = receive_bytes( socket, buf, min(len, socket->read_size), &count, FALSE ); + if (!ret) + { + socket->last_receive_final = final; + ret = receive_bytes( socket, buf, min(len, socket->read_size), &count, FALSE ); + } if (!ret) { if (count < socket->read_size) @@ -3767,7 +3805,14 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD socket->read_size -= count; *ret_len = count; - *ret_type = map_opcode( socket->opcode, socket->read_size != 0 ); + *ret_type = map_opcode( socket, socket->opcode, !final || socket->read_size != 0 ); + TRACE( "len %lu, *ret_len %lu, *ret_type %u.\n", len, *ret_len, *ret_type ); + if (*ret_type == ~0u) + { + FIXME( "Unexpected opcode %u.\n", socket->opcode ); + socket->read_size = 0; + return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + } } return ret; } @@ -3978,6 +4023,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r static DWORD socket_close( struct socket *socket ) { + BOOL final = FALSE; DWORD ret, count; if (socket->close_frame_received) return socket->close_frame_receive_err; @@ -3986,12 +4032,14 @@ static DWORD socket_close( struct socket *socket ) while (1) { - if ((ret = receive_frame( socket, &count, &socket->opcode ))) return ret; + if ((ret = receive_frame( socket, &count, &socket->opcode, &final ))) return ret; if (socket->opcode == SOCKET_OPCODE_CLOSE) break; socket->read_size = count; if ((ret = socket_drain( socket ))) return ret; } + if (!final) + FIXME( "Received close opcode without FIN bit.\n" ); return receive_close_status( socket, count ); } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index bebc3ac1a07..19ef9a35e2d 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -269,6 +269,8 @@ struct socket SRWLOCK send_lock; volatile LONG pending_noncontrol_send; enum fragment_type sending_fragment_type; + enum fragment_type receiving_fragment_type; + BOOL last_receive_final; }; struct send_request -- 2.30.2

1 0

[PATCH v2 1/3] winhttp: Don't allow websocket send if another non-control send is pending.
by Hans Leidekker 28 Feb '22

28 Feb '22

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 16 +++++++++++++++- dlls/winhttp/winhttp_private.h | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d0732952e11..de011060236 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3349,6 +3349,7 @@ static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx else ret = socket_send( s->socket, s->type, s->buf, s->len, NULL ); send_io_complete( &s->socket->hdr ); + InterlockedExchange( &s->socket->pending_noncontrol_send, 0 ); socket_send_complete( s->socket, ret, s->type, s->len ); release_object( &s->socket->hdr ); @@ -3386,8 +3387,16 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ BOOL async_send, complete_async = FALSE; struct socket_send *s; + if (InterlockedCompareExchange( &socket->pending_noncontrol_send, 1, 0 )) + { + WARN( "Previous send is still queued.\n" ); + release_object( &socket->hdr ); + return ERROR_INVALID_OPERATION; + } + if (!(s = malloc( sizeof(*s) ))) { + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); release_object( &socket->hdr ); return ERROR_OUTOFMEMORY; } @@ -3417,11 +3426,16 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ if ((ret = queue_task( &socket->send_q, task_socket_send, s ))) { InterlockedDecrement( &socket->hdr.pending_sends ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); release_object( &socket->hdr ); free( s ); } } - else InterlockedDecrement( &socket->hdr.pending_sends ); + else + { + InterlockedDecrement( &socket->hdr.pending_sends ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); + } ReleaseSRWLockExclusive( &socket->send_lock ); if (!async_send) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 732f0afaa88..cf6655f561f 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -260,6 +260,7 @@ struct socket unsigned int bytes_in_send_frame_buffer; unsigned int client_buffer_offset; SRWLOCK send_lock; + volatile LONG pending_noncontrol_send; }; struct send_request -- 2.30.2

1 0

[PATCH vkd3d 10/10] vkd3d: Properly compare integers in compare_register_range().
by Henri Verbeet 28 Feb '22

28 Feb '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 0cf0c55f..ffd92d1a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -821,13 +821,13 @@ static int compare_register_range(const void *a, const void *b) const struct d3d12_root_descriptor_table_range *range_a = a, *range_b = b; int ret; - if ((ret = range_a->type - range_b->type)) + if ((ret = vkd3d_u32_compare(range_a->type, range_b->type))) return ret; - if ((ret = range_a->register_space - range_b->register_space)) + if ((ret = vkd3d_u32_compare(range_a->register_space, range_b->register_space))) return ret; - return range_a->base_register_idx - range_b->base_register_idx; + return vkd3d_u32_compare(range_a->base_register_idx, range_b->base_register_idx); } static int compare_descriptor_range(const void *a, const void *b) -- 2.20.1

1 0

[PATCH vkd3d 09/10] vkd3d-shader/spirv: Properly compare integers in vkd3d_symbol_compare().
by Henri Verbeet 28 Feb '22

28 Feb '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc8748d9..0e3dbf08 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2046,9 +2046,10 @@ static int vkd3d_symbol_compare(const void *key, const struct rb_entry *entry) { const struct vkd3d_symbol *a = key; const struct vkd3d_symbol *b = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry); + int ret; - if (a->type != b->type) - return a->type - b->type; + if ((ret = vkd3d_u32_compare(a->type, b->type))) + return ret; return memcmp(&a->key, &b->key, sizeof(a->key)); } -- 2.20.1

1 0

[PATCH vkd3d 08/10] vkd3d-shader/spirv: Properly compare integers in vkd3d_spirv_declaration_compare().
by Henri Verbeet 28 Feb '22

28 Feb '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1ffce6a1..cc8748d9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -511,11 +511,12 @@ static int vkd3d_spirv_declaration_compare(const void *key, const struct rb_entr { const struct vkd3d_spirv_declaration *a = key; const struct vkd3d_spirv_declaration *b = RB_ENTRY_VALUE(e, const struct vkd3d_spirv_declaration, entry); + int ret; - if (a->op != b->op) - return a->op - b->op; - if (a->parameter_count != b->parameter_count) - return a->parameter_count - b->parameter_count; + if ((ret = vkd3d_u32_compare(a->op, b->op))) + return ret; + if ((ret = vkd3d_u32_compare(a->parameter_count, b->parameter_count))) + return ret; assert(a->parameter_count <= ARRAY_SIZE(a->parameters)); return memcmp(&a->parameters, &b->parameters, a->parameter_count * sizeof(*a->parameters)); } -- 2.20.1

1 0

[PATCH vkd3d 07/10] vkd3d-shader/hlsl: Properly compare integers in compare_function_decl_rb().
by Henri Verbeet 28 Feb '22

28 Feb '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 689b9dab..00a374b4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -847,8 +847,8 @@ static int compare_function_decl_rb(const void *key, const struct rb_entry *entr struct list *p1cur, *p2cur; int r; - if (params_count != decl_params_count) - return params_count - decl_params_count; + if ((r = vkd3d_u32_compare(params_count, decl_params_count))) + return r; p1cur = params ? list_head(params) : NULL; p2cur = decl->parameters ? list_head(decl->parameters) : NULL; -- 2.20.1

1 0

[PATCH vkd3d 06/10] vkd3d-shader/hlsl: Properly compare integers in compare_param_hlsl_types().
by Henri Verbeet 28 Feb '22

28 Feb '22

As pointed out by Giovanni Mascellani, modular subtraction doesn't produce a total order; in particular, it's not transitive. The nature of the types being compared here makes it unlikely this will be an issue in practice, but it's both fragile and setting a poor example. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/private/vkd3d_common.h | 5 +++++ libs/vkd3d-shader/hlsl.c | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index 1e19758a..ac556850 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -158,6 +158,11 @@ static inline uint32_t vkd3d_make_u32(uint16_t low, uint16_t high) return low | ((uint32_t)high << 16); } +static inline int vkd3d_u32_compare(uint32_t x, uint32_t y) +{ + return (x > y) - (x < y); +} + static inline int ascii_isupper(int c) { return 'A' <= c && c <= 'Z'; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8197fa9f..689b9dab 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -786,26 +786,26 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls { int r; - if (t1->type != t2->type) + if ((r = vkd3d_u32_compare(t1->type, t2->type))) { if (!((t1->type == HLSL_CLASS_SCALAR && t2->type == HLSL_CLASS_VECTOR) || (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_SCALAR))) - return t1->type - t2->type; + return r; } - if (t1->base_type != t2->base_type) - return t1->base_type - t2->base_type; + if ((r = vkd3d_u32_compare(t1->base_type, t2->base_type))) + return r; if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) { - if (t1->sampler_dim != t2->sampler_dim) - return t1->sampler_dim - t2->sampler_dim; + if ((r = vkd3d_u32_compare(t1->sampler_dim, t2->sampler_dim))) + return r; if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC && (r = compare_param_hlsl_types(t1->e.resource_format, t2->e.resource_format))) return r; } - if (t1->dimx != t2->dimx) - return t1->dimx - t2->dimx; - if (t1->dimy != t2->dimy) - return t1->dimx - t2->dimx; + if ((r = vkd3d_u32_compare(t1->dimx, t2->dimx))) + return r; + if ((r = vkd3d_u32_compare(t1->dimy, t2->dimy))) + return r; if (t1->type == HLSL_CLASS_STRUCT) { struct list *t1cur, *t2cur; @@ -830,8 +830,8 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->type == HLSL_CLASS_ARRAY) { - if (t1->e.array.elements_count != t2->e.array.elements_count) - return t1->e.array.elements_count - t2->e.array.elements_count; + if ((r = vkd3d_u32_compare(t1->e.array.elements_count, t2->e.array.elements_count))) + return r; return compare_param_hlsl_types(t1->e.array.type, t2->e.array.type); } -- 2.20.1

1 0

[PATCH vkd3d 05/10] vkd3d-shader: Handle double-precision floating-point data in vkd3d_shader_scan_typed_resource_declaration().
by Henri Verbeet 28 Feb '22

28 Feb '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 8 ++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1576411f..df15047c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1208,6 +1208,14 @@ enum vkd3d_shader_resource_data_type VKD3D_SHADER_RESOURCE_DATA_FLOAT = 0x5, /** Undefined/type-less. \since 1.3 */ VKD3D_SHADER_RESOURCE_DATA_MIXED = 0x6, + /** IEEE double-precision floating-point. \since 1.3 */ + VKD3D_SHADER_RESOURCE_DATA_DOUBLE = 0x7, + /** Continuation of the previous component. For example, 64-bit + * double-precision floating-point data may be returned as two 32-bit + * components, with the first component (containing the LSB) specified as + * VKD3D_SHADER_RESOURCE_DATA_DOUBLE, and the second component specified + * as VKD3D_SHADER_RESOURCE_DATA_CONTINUED. \since 1.3 */ + VKD3D_SHADER_RESOURCE_DATA_CONTINUED = 0x8, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_DATA_TYPE), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 298289c0..b5b66e1f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -757,6 +757,12 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca case VKD3D_DATA_MIXED: resource_data_type = VKD3D_SHADER_RESOURCE_DATA_MIXED; break; + case VKD3D_DATA_DOUBLE: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_DOUBLE; + break; + case VKD3D_DATA_CONTINUED: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_CONTINUED; + break; default: ERR("Invalid resource data type %#x.\n", semantic->resource_data_type[0]); resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; -- 2.20.1

1 0

[PATCH vkd3d 04/10] vkd3d-shader: Handle "mixed" data in vkd3d_shader_scan_typed_resource_declaration().
by Henri Verbeet 28 Feb '22

28 Feb '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fece054e..1576411f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1197,15 +1197,17 @@ enum vkd3d_shader_resource_type enum vkd3d_shader_resource_data_type { /** Unsigned normalized integer. */ - VKD3D_SHADER_RESOURCE_DATA_UNORM = 0x1, + VKD3D_SHADER_RESOURCE_DATA_UNORM = 0x1, /** Signed normalized integer. */ - VKD3D_SHADER_RESOURCE_DATA_SNORM = 0x2, + VKD3D_SHADER_RESOURCE_DATA_SNORM = 0x2, /** Signed integer. */ - VKD3D_SHADER_RESOURCE_DATA_INT = 0x3, + VKD3D_SHADER_RESOURCE_DATA_INT = 0x3, /** Unsigned integer. */ - VKD3D_SHADER_RESOURCE_DATA_UINT = 0x4, - /** IEEE floating-point. */ - VKD3D_SHADER_RESOURCE_DATA_FLOAT = 0x5, + VKD3D_SHADER_RESOURCE_DATA_UINT = 0x4, + /** IEEE single-precision floating-point. */ + VKD3D_SHADER_RESOURCE_DATA_FLOAT = 0x5, + /** Undefined/type-less. \since 1.3 */ + VKD3D_SHADER_RESOURCE_DATA_MIXED = 0x6, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_RESOURCE_DATA_TYPE), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a25e28a7..298289c0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -477,6 +477,8 @@ struct vkd3d_shader_scan_context } *uav_ranges; size_t uav_ranges_size; size_t uav_range_count; + + enum vkd3d_shader_api_version api_version; }; static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *context, @@ -484,11 +486,22 @@ static void vkd3d_shader_scan_context_init(struct vkd3d_shader_scan_context *con struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, struct vkd3d_shader_message_context *message_context) { + unsigned int i; + memset(context, 0, sizeof(*context)); context->scan_descriptor_info = scan_descriptor_info; context->message_context = message_context; context->location.source_name = compile_info->source_name; context->location.line = 2; /* Line 1 is the version token. */ + context->api_version = VKD3D_SHADER_API_VERSION_1_2; + + for (i = 0; i < compile_info->option_count; ++i) + { + const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; + + if (option->name == VKD3D_SHADER_COMPILE_OPTION_API_VERSION) + context->api_version = option->value; + } } static void vkd3d_shader_scan_context_cleanup(struct vkd3d_shader_scan_context *context) @@ -741,11 +754,23 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca case VKD3D_DATA_FLOAT: resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; break; + case VKD3D_DATA_MIXED: + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_MIXED; + break; default: ERR("Invalid resource data type %#x.\n", semantic->resource_data_type[0]); resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; break; } + + if (context->api_version < VKD3D_SHADER_API_VERSION_1_3 + && resource_data_type >= VKD3D_SHADER_RESOURCE_DATA_MIXED) + { + ERR("Invalid resource data type %#x for API version %#x.\n", + semantic->resource_data_type[0], context->api_version); + resource_data_type = VKD3D_SHADER_RESOURCE_DATA_FLOAT; + } + vkd3d_shader_scan_resource_declaration(context, &semantic->resource, semantic->resource_type, resource_data_type); } -- 2.20.1

1 0

[PATCH vkd3d 03/10] vkd3d-shader: Explicitly handle VKD3D_DATA_MIXED in vkd3d_component_type_from_data_type().
by Henri Verbeet 28 Feb '22

28 Feb '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 50c1e9de..2deaa46c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1114,6 +1114,8 @@ static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_ty return VKD3D_SHADER_COMPONENT_DOUBLE; default: FIXME("Unhandled data type %#x.\n", data_type); + /* fall-through */ + case VKD3D_DATA_MIXED: return VKD3D_SHADER_COMPONENT_UINT; } } -- 2.20.1

1 0