- Wine-devel - list.winehq.org

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

28 Feb '22

From: Paul Gofman <pgofman(a)codeweavers.com> v2: Determine whether the frame is final in socket_send() instead of passing a BOOL parameter to map_buffer_type(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 91 +++++++++++++++++++++++++++---- dlls/winhttp/tests/notification.c | 22 +++++++- dlls/winhttp/winhttp_private.h | 8 +++ 3 files changed, 108 insertions(+), 13 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index de011060236..48e25023d07 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3298,13 +3298,65 @@ static BOOL socket_can_receive( struct socket *socket ) return socket->state <= SOCKET_STATE_SHUTDOWN && !socket->close_frame_received; } -static enum socket_opcode map_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) +static BOOL validate_buffer_type( WINHTTP_WEB_SOCKET_BUFFER_TYPE type, enum fragment_type current_fragment ) +{ + switch (current_fragment) + { + case SOCKET_FRAGMENT_NONE: + return type == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + case SOCKET_FRAGMENT_BINARY: + return type == WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE; + case SOCKET_FRAGMENT_UTF8: + return type == WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE + || type == WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE; + } + assert( 0 ); + return FALSE; +} + +static enum socket_opcode map_buffer_type( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type ) { switch (type) { - case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_TEXT; - case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: return SOCKET_OPCODE_BINARY; - case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: return SOCKET_OPCODE_CLOSE; + case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE: + if (socket->sending_fragment_type) + { + socket->sending_fragment_type = SOCKET_FRAGMENT_NONE; + return SOCKET_OPCODE_CONTINUE; + } + return SOCKET_OPCODE_TEXT; + + case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: + if (socket->sending_fragment_type) + { + socket->sending_fragment_type = SOCKET_FRAGMENT_NONE; + return SOCKET_OPCODE_CONTINUE; + } + return SOCKET_OPCODE_BINARY; + + case WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE: + if (!socket->sending_fragment_type) + { + socket->sending_fragment_type = SOCKET_FRAGMENT_UTF8; + return SOCKET_OPCODE_TEXT; + } + return SOCKET_OPCODE_CONTINUE; + + case WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE: + if (!socket->sending_fragment_type) + { + socket->sending_fragment_type = SOCKET_FRAGMENT_BINARY; + return SOCKET_OPCODE_BINARY; + } + return SOCKET_OPCODE_CONTINUE; + + case WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE: + return SOCKET_OPCODE_CLOSE; + default: FIXME("buffer type %u not supported\n", type); return SOCKET_OPCODE_INVALID; @@ -3333,9 +3385,11 @@ static void socket_send_complete( struct socket *socket, DWORD ret, WINHTTP_WEB_ static DWORD socket_send( struct socket *socket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, const void *buf, DWORD len, WSAOVERLAPPED *ovr ) { - enum socket_opcode opcode = map_buffer_type( type ); + enum socket_opcode opcode = map_buffer_type( socket, type ); + BOOL final = (type != WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE && + type != WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE); - return send_frame( socket, opcode, 0, buf, len, TRUE, ovr ); + return send_frame( socket, opcode, 0, buf, len, final, ovr ); } static void CALLBACK task_socket_send( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) @@ -3364,11 +3418,6 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ TRACE( "%p, %u, %p, %lu\n", hsocket, type, buf, len ); if (len && !buf) return ERROR_INVALID_PARAMETER; - if (type != WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE && type != WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE) - { - FIXME("buffer type %u not supported\n", type); - return ERROR_NOT_SUPPORTED; - } if (!(socket = (struct socket *)grab_object( hsocket ))) return ERROR_INVALID_HANDLE; if (socket->hdr.type != WINHTTP_HANDLE_TYPE_SOCKET) @@ -3393,6 +3442,13 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ release_object( &socket->hdr ); return ERROR_INVALID_OPERATION; } + if (!validate_buffer_type( type, socket->sending_fragment_type )) + { + WARN( "Invalid buffer type %u, sending_fragment_type %u.\n", type, socket->sending_fragment_type ); + InterlockedExchange( &socket->pending_noncontrol_send, 0 ); + release_object( &socket->hdr ); + return ERROR_INVALID_PARAMETER; + } if (!(s = malloc( sizeof(*s) ))) { @@ -3445,7 +3501,18 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ ret = ERROR_SUCCESS; } } - else ret = socket_send( socket, type, buf, len, NULL ); + else + { + if (validate_buffer_type( type, socket->sending_fragment_type )) + { + ret = socket_send( socket, type, buf, len, NULL ); + } + else + { + WARN( "Invalid buffer type %u, sending_fragment_type %u.\n", type, socket->sending_fragment_type ); + ret = ERROR_INVALID_PARAMETER; + } + } release_object( &socket->hdr ); return ret; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index ffde61b3bf5..50874a49a07 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -676,6 +676,8 @@ static const struct notification websocket_test[] = { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, + { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, + { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, @@ -867,7 +869,25 @@ static void test_websocket(BOOL secure) for (i = 0; i < BIG_BUFFER_SIZE; ++i) big_buffer[i] = (i & 0xff) ^ 0xcc; setup_test( &info, winhttp_websocket_send, __LINE__ ); - err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, big_buffer, BIG_BUFFER_SIZE ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, big_buffer, BIG_BUFFER_SIZE / 2 ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE, + big_buffer + BIG_BUFFER_SIZE / 2, BIG_BUFFER_SIZE / 2 ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE, + big_buffer + BIG_BUFFER_SIZE / 2, BIG_BUFFER_SIZE / 2 ); + ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); + + setup_test( &info, winhttp_websocket_send, __LINE__ ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE, + big_buffer + BIG_BUFFER_SIZE / 2, BIG_BUFFER_SIZE / 2 ); + ok( err == ERROR_SUCCESS, "got %lu\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + + setup_test( &info, winhttp_websocket_send, __LINE__ ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, NULL, 0 ); ok( err == ERROR_SUCCESS, "got %lu\n", err ); WaitForSingleObject( info.wait, INFINITE ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index cf6655f561f..bebc3ac1a07 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -238,6 +238,13 @@ enum socket_opcode SOCKET_OPCODE_INVALID = 0xff, }; +enum fragment_type +{ + SOCKET_FRAGMENT_NONE, + SOCKET_FRAGMENT_BINARY, + SOCKET_FRAGMENT_UTF8, +}; + struct socket { struct object_header hdr; @@ -261,6 +268,7 @@ struct socket unsigned int client_buffer_offset; SRWLOCK send_lock; volatile LONG pending_noncontrol_send; + enum fragment_type sending_fragment_type; }; struct send_request -- 2.30.2

2 1

[PATCH vkd3d 02/10] vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_API_VERSION.
by Henri Verbeet 28 Feb '22

28 Feb '22

Analogous to vkd3d_api_version for libvkd3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 11 +++++++++++ libs/vkd3d-utils/vkd3d_utils_main.c | 17 +++++++++++++---- libs/vkd3d/state.c | 18 ++++++++++++++---- programs/vkd3d-compiler/main.c | 3 ++- 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index be2be3c3..fece054e 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -38,6 +38,15 @@ extern "C" { * compilation, transformation, and reflection of GPU shaders. */ +/** \since 1.3 */ +enum vkd3d_shader_api_version +{ + VKD3D_SHADER_API_VERSION_1_0, + VKD3D_SHADER_API_VERSION_1_1, + VKD3D_SHADER_API_VERSION_1_2, + VKD3D_SHADER_API_VERSION_1_3, +}; + /** The type of a chained structure. */ enum vkd3d_shader_structure_type { @@ -115,6 +124,8 @@ enum vkd3d_shader_compile_option_name VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, /** \a value is a member of enum vkd3d_shader_compile_option_formatting_flags. */ VKD3D_SHADER_COMPILE_OPTION_FORMATTING = 0x00000003, + /** \a value is a member of enum vkd3d_shader_api_version. \since 1.3 */ + VKD3D_SHADER_COMPILE_OPTION_API_VERSION = 0x00000004, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 006e5e20..5534453b 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -158,7 +158,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { struct vkd3d_shader_preprocess_info preprocess_info; struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[1]; + struct vkd3d_shader_compile_option options[2]; struct vkd3d_shader_compile_info compile_info; struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; @@ -208,6 +208,10 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (messages_blob) *messages_blob = NULL; + option = &options[0]; + option->name = VKD3D_SHADER_COMPILE_OPTION_API_VERSION; + option->value = VKD3D_SHADER_API_VERSION_1_3; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = &preprocess_info; compile_info.source.code = data; @@ -215,7 +219,7 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; compile_info.target_type = VKD3D_SHADER_TARGET_DXBC_TPF; compile_info.options = options; - compile_info.option_count = 0; + compile_info.option_count = 1; compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; @@ -310,6 +314,11 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename HRESULT hr; int ret; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + TRACE("data %p, size %lu, filename %s, macros %p, include %p, preprocessed_blob %p, messages_blob %p.\n", data, size, debugstr_a(filename), macros, include, preprocessed_blob, messages_blob); @@ -322,8 +331,8 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename compile_info.source.size = size; compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; compile_info.target_type = VKD3D_SHADER_TARGET_NONE; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 91f6e27b..0cf0c55f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1768,6 +1768,11 @@ static HRESULT create_shader_stage(struct d3d12_device *device, VkResult vr; int ret; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + stage_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; stage_desc->pNext = NULL; stage_desc->flags = 0; @@ -1785,8 +1790,8 @@ static HRESULT create_shader_stage(struct d3d12_device *device, compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; @@ -1814,14 +1819,19 @@ static int vkd3d_scan_dxbc(const D3D12_SHADER_BYTECODE *code, { struct vkd3d_shader_compile_info compile_info; + static const struct vkd3d_shader_compile_option options[] = + { + {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3}, + }; + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; compile_info.next = descriptor_info; compile_info.source.code = code->pShaderBytecode; compile_info.source.size = code->BytecodeLength; compile_info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; compile_info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; - compile_info.options = NULL; - compile_info.option_count = 0; + compile_info.options = options; + compile_info.option_count = ARRAY_SIZE(options); compile_info.log_level = VKD3D_SHADER_LOG_NONE; compile_info.source_name = NULL; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index f1a6b475..2f330f62 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -34,7 +34,7 @@ #include <term.h> #endif -#define MAX_COMPILE_OPTIONS 3 +#define MAX_COMPILE_OPTIONS 4 enum { @@ -729,6 +729,7 @@ int main(int argc, char **argv) if (!options.explicit_colour && !getenv("NO_COLOUR") && !getenv("NO_COLOR") && has_colour(output)) options.formatting |= VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR; add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_FORMATTING, options.formatting); + add_compile_option(&options, VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_3); info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = &hlsl_source_info; -- 2.20.1

2 1

[PATCH vkd3d 01/10] vkd3d-shader/hlsl: Respect the requested target type.
by Henri Verbeet 28 Feb '22

28 Feb '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 5 ++++ libs/vkd3d-shader/hlsl.c | 17 +++++++++-- libs/vkd3d-shader/hlsl.h | 3 +- libs/vkd3d-shader/hlsl_codegen.c | 19 +++++++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 3 +- libs/vkd3d-utils/vkd3d_utils_main.c | 36 ++++++++++++++++++++++++ programs/vkd3d-compiler/main.c | 4 +++ 8 files changed, 79 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 6ce98194..be2be3c3 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -581,6 +581,11 @@ enum vkd3d_shader_target_type VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_SHADER_TARGET_SPIRV_TEXT, VKD3D_SHADER_TARGET_D3D_ASM, + /** + * Legacy Direct3D byte-code. This is the format used for Direct3D shader + * model 1, 2, and 3 shaders. + */ + VKD3D_SHADER_TARGET_D3D_BYTECODE, /** * A 'Tokenized Program Format' shader embedded in a DXBC container. This is * the format used for Direct3D shader model 4 and 5 shaders. diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a9a42770..8197fa9f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1952,7 +1952,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) } int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; struct hlsl_ir_function_decl *entry_func; @@ -1976,6 +1976,19 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d vkd3d_shader_dump_shader(compile_info->source_type, profile->type, &compile_info->source); + if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_BYTECODE && profile->major_version > 3) + { + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, + "The '%s' target profile is incompatible with the 'd3dbc' target type.", profile->name); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + else if (compile_info->target_type == VKD3D_SHADER_TARGET_DXBC_TPF && profile->major_version < 4) + { + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, + "The '%s' target profile is incompatible with the 'dxbc-tpf' target type.", profile->name); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if (!hlsl_ctx_init(&ctx, compile_info->source_name, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -2009,7 +2022,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } - ret = hlsl_emit_dxbc(&ctx, entry_func, dxbc); + ret = hlsl_emit_bytecode(&ctx, entry_func, compile_info->target_type, out); hlsl_ctx_cleanup(&ctx); return ret; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 043d7fb3..243ed72b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -711,7 +711,8 @@ bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var void hlsl_dump_function(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *func); -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); +int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out); void hlsl_replace_node(struct hlsl_ir_node *old, struct hlsl_ir_node *new); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e416647f..837d39e3 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1611,7 +1611,8 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere return ret; } -int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) +int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, + enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { struct hlsl_block *const body = &entry_func->body; struct hlsl_ir_var *var; @@ -1697,8 +1698,16 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun if (ctx->result) return ctx->result; - if (ctx->profile->major_version < 4) - return hlsl_sm1_write(ctx, entry_func, out); - else - return hlsl_sm4_write(ctx, entry_func, out); + switch (target_type) + { + case VKD3D_SHADER_TARGET_D3D_BYTECODE: + return hlsl_sm1_write(ctx, entry_func, out); + + case VKD3D_SHADER_TARGET_DXBC_TPF: + return hlsl_sm4_write(ctx, entry_func, out); + + default: + ERR("Unsupported shader target type %#x.\n", target_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ae0662b8..a25e28a7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1399,6 +1399,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( static const enum vkd3d_shader_target_type hlsl_types[] = { + VKD3D_SHADER_TARGET_D3D_BYTECODE, VKD3D_SHADER_TARGET_DXBC_TPF, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5ab8494c..50c1e9de 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -116,6 +116,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED = 5017, VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET = 5018, VKD3D_SHADER_ERROR_HLSL_OFFSET_OUT_OF_BOUNDS = 5019, + VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE = 5020, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, @@ -1094,7 +1095,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context); + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index ee3bfb4e..006e5e20 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -163,10 +163,34 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen struct vkd3d_shader_compile_option *option; struct vkd3d_shader_code byte_code; const D3D_SHADER_MACRO *macro; + size_t profile_len, i; char *messages; HRESULT hr; int ret; + static const char * const d3dbc_profiles[] = + { + "fx_2_", + + "ps.1.", + "ps.2.", + "ps.3.", + + "ps_1_", + "ps_2_", + "ps_3_", + + "vs.1.", + "vs.2.", + "vs.3.", + + "vs_1_", + "vs_2_", + "vs_3_", + + "tx_1_", + }; + TRACE("data %p, data_size %lu, filename %s, macros %p, include %p, entry_point %s, " "profile %s, flags %#x, effect_flags %#x, secondary_flags %#x, secondary_data %p, " "secondary_data_size %lu, shader_blob %p, messages_blob %p.\n", @@ -195,6 +219,18 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; + profile_len = strlen(profile); + for (i = 0; i < ARRAY_SIZE(d3dbc_profiles); ++i) + { + size_t len = strlen(d3dbc_profiles[i]); + + if (len <= profile_len && !memcmp(profile, d3dbc_profiles[i], len)) + { + compile_info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE; + break; + } + } + preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO; preprocess_info.next = &hlsl_info; preprocess_info.macros = (const struct vkd3d_shader_macro *)macros; diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index c974c9a8..f1a6b475 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -97,6 +97,10 @@ target_type_info[] = {VKD3D_SHADER_TARGET_D3D_ASM, "d3d-asm", "A shader in Direct3D assembly form.\n", false}, + {VKD3D_SHADER_TARGET_D3D_BYTECODE, + "d3dbc", "Legacy Direct3D byte-code.\n" + " This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n", + true}, {VKD3D_SHADER_TARGET_DXBC_TPF, "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" " This is the format used for Direct3D shader model 4 and 5 shaders.\n", -- 2.20.1

2 1

[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