wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Zebediah Figura : server: Remove the no longer used get_socket_event request.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: f7ffd71f3c202add51159bffde032832109c2e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7ffd71f3c202add51159bff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:12 2021 -0500 server: Remove the no longer used get_socket_event request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 22 +--------------------- server/protocol.def | 12 ------------ server/request.h | 9 --------- server/sock.c | 39 --------------------------------------- server/trace.c | 17 ----------------- 5 files changed, 1 insertion(+), 98 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index aac97b26b99..095c2ac7d04 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1730,23 +1730,6 @@ struct unlock_file_reply -struct get_socket_event_request -{ - struct request_header __header; - obj_handle_t handle; - int service; - obj_handle_t c_event; -}; -struct get_socket_event_reply -{ - struct reply_header __header; - unsigned int mask; - unsigned int pmask; - /* VARARG(errors,ints); */ -}; - - - struct recv_socket_request { struct request_header __header; @@ -5456,7 +5439,6 @@ enum request REQ_get_volume_info, REQ_lock_file, REQ_unlock_file, - REQ_get_socket_event, REQ_recv_socket, REQ_poll_socket, REQ_send_socket, @@ -5736,7 +5718,6 @@ union generic_request struct get_volume_info_request get_volume_info_request; struct lock_file_request lock_file_request; struct unlock_file_request unlock_file_request; - struct get_socket_event_request get_socket_event_request; struct recv_socket_request recv_socket_request; struct poll_socket_request poll_socket_request; struct send_socket_request send_socket_request; @@ -6014,7 +5995,6 @@ union generic_reply struct get_volume_info_reply get_volume_info_reply; struct lock_file_reply lock_file_reply; struct unlock_file_reply unlock_file_reply; - struct get_socket_event_reply get_socket_event_reply; struct recv_socket_reply recv_socket_reply; struct poll_socket_reply poll_socket_reply; struct send_socket_reply send_socket_reply; @@ -6238,7 +6218,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 715 +#define SERVER_PROTOCOL_VERSION 716 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index b5bc049ccf6..343febda6c5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1423,18 +1423,6 @@ enum server_fd_type @END -/* Get socket event parameters */ -@REQ(get_socket_event) - obj_handle_t handle; /* handle to the socket */ - int service; /* clear pending? */ - obj_handle_t c_event; /* event to clear */ -@REPLY - unsigned int mask; /* event mask */ - unsigned int pmask; /* pending events */ - VARARG(errors,ints); /* event errors */ -@END - - /* Perform a recv on a socket */ @REQ(recv_socket) int oob; /* are we receiving OOB data? */ diff --git a/server/request.h b/server/request.h index 30fbfcc516a..d38ddae6c5e 100644 --- a/server/request.h +++ b/server/request.h @@ -172,7 +172,6 @@ DECL_HANDLER(get_file_info); DECL_HANDLER(get_volume_info); DECL_HANDLER(lock_file); DECL_HANDLER(unlock_file); -DECL_HANDLER(get_socket_event); DECL_HANDLER(recv_socket); DECL_HANDLER(poll_socket); DECL_HANDLER(send_socket); @@ -451,7 +450,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_volume_info, (req_handler)req_lock_file, (req_handler)req_unlock_file, - (req_handler)req_get_socket_event, (req_handler)req_recv_socket, (req_handler)req_poll_socket, (req_handler)req_send_socket, @@ -1034,13 +1032,6 @@ C_ASSERT( FIELD_OFFSET(struct unlock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct unlock_file_request, count) == 24 ); C_ASSERT( sizeof(struct unlock_file_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, service) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_request, c_event) == 20 ); -C_ASSERT( sizeof(struct get_socket_event_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, mask) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_socket_event_reply, pmask) == 12 ); -C_ASSERT( sizeof(struct get_socket_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, oob) == 12 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, status) == 56 ); diff --git a/server/sock.c b/server/sock.c index f614bf5feaa..e7754dc0da3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2976,45 +2976,6 @@ struct object *create_socket_device( struct object *root, const struct unicode_s return create_named_object( root, &socket_device_ops, name, attr, sd ); } -/* get socket event parameters */ -DECL_HANDLER(get_socket_event) -{ - unsigned int errors[FD_MAX_EVENTS] = {0}; - struct sock *sock; - - if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, - FILE_READ_ATTRIBUTES, &sock_ops ))) return; - if (get_unix_fd( sock->fd ) == -1) return; - reply->mask = afd_poll_flag_to_win32( sock->mask ); - reply->pmask = afd_poll_flag_to_win32( sock->pending_events ); - - errors[FD_READ_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_READ] ); - errors[FD_WRITE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_WRITE] ); - errors[FD_OOB_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_OOB] ); - errors[FD_ACCEPT_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_ACCEPT] ); - errors[FD_CONNECT_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_CONNECT_ERR] ); - if (!(errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_HUP] ))) - errors[FD_CLOSE_BIT] = sock_get_error( sock->errors[AFD_POLL_BIT_RESET] ); - set_reply_data( errors, min( get_reply_max_size(), sizeof(errors) )); - - if (req->service) - { - if (req->c_event) - { - struct event *cevent = get_event_obj( current->process, req->c_event, - EVENT_MODIFY_STATE ); - if (cevent) - { - reset_event( cevent ); - release_object( cevent ); - } - } - sock->pending_events = 0; - sock_reselect( sock ); - } - release_object( &sock->obj ); -} - DECL_HANDLER(recv_socket) { struct sock *sock = (struct sock *)get_handle_obj( current->process, req->async.handle, 0, &sock_ops ); diff --git a/server/trace.c b/server/trace.c index 46f6678fb87..81b482b8338 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2073,20 +2073,6 @@ static void dump_unlock_file_request( const struct unlock_file_request *req ) dump_uint64( ", count=", &req->count ); } -static void dump_get_socket_event_request( const struct get_socket_event_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", service=%d", req->service ); - fprintf( stderr, ", c_event=%04x", req->c_event ); -} - -static void dump_get_socket_event_reply( const struct get_socket_event_reply *req ) -{ - fprintf( stderr, " mask=%08x", req->mask ); - fprintf( stderr, ", pmask=%08x", req->pmask ); - dump_varargs_ints( ", errors=", cur_size ); -} - static void dump_recv_socket_request( const struct recv_socket_request *req ) { fprintf( stderr, " oob=%d", req->oob ); @@ -4571,7 +4557,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_request, (dump_func)dump_lock_file_request, (dump_func)dump_unlock_file_request, - (dump_func)dump_get_socket_event_request, (dump_func)dump_recv_socket_request, (dump_func)dump_poll_socket_request, (dump_func)dump_send_socket_request, @@ -4847,7 +4832,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_volume_info_reply, (dump_func)dump_lock_file_reply, NULL, - (dump_func)dump_get_socket_event_reply, (dump_func)dump_recv_socket_reply, (dump_func)dump_poll_socket_reply, (dump_func)dump_send_socket_reply, @@ -5123,7 +5107,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_volume_info", "lock_file", "unlock_file", - "get_socket_event", "recv_socket", "poll_socket", "send_socket",

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_SO_ERROR.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: fb3956fcf94397bed53598943a9524520bc23e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb3956fcf94397bed5359894… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:11 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_SO_ERROR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 41 +---------------------------------------- dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ab111f726a9..b183b85b0b3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -694,19 +694,6 @@ static inline void release_sock_fd( SOCKET s, int fd ) close( fd ); } -static void _get_sock_errors(SOCKET s, int *events) -{ - SERVER_START_REQ( get_socket_event ) - { - req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); - req->service = FALSE; - req->c_event = 0; - wine_server_set_reply( req, events, sizeof(int) * FD_MAX_EVENTS ); - wine_server_call( req ); - } - SERVER_END_REQ; -} - static int _get_fd_type(int fd) { int sock_type = -1; @@ -2236,33 +2223,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return 0; case WS_SO_ERROR: - { - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - release_sock_fd( s, fd ); - - /* The wineserver may have swallowed the error before us */ - if (!ret && *(int*) optval == 0) - { - int i, events[FD_MAX_EVENTS]; - _get_sock_errors(s, events); - for (i = 0; i < FD_MAX_EVENTS; i++) - { - if(events[i]) - { - TRACE("returning SO_ERROR %d from wine server\n", events[i]); - *(int*) optval = events[i]; - break; - } - } - } - return ret; - } + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ERROR, optval, optlen ); case WS_SO_LINGER: { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7534e75edb3..9f461376853 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1295,7 +1295,6 @@ todo_wine SetLastError(0xdeadbeef); i = 4321; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1306,7 +1305,6 @@ todo_wine SetLastError(0xdeadbeef); size = 1; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEFAULT), "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError());

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_SO_ERROR.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: wine Branch: master Commit: 8211c3ab36d48f9ce968711f7a63e7bcb10e78f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8211c3ab36d48f9ce968711f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 00:00:10 2021 -0500 server: Introduce IOCTL_AFD_WINE_GET_SO_ERROR. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 6370e00539f..0ccd248e614 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -162,6 +162,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 71f22845827..f614bf5feaa 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2546,6 +2546,40 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_WINE_GET_SO_ERROR: + { + int error; + socklen_t len = sizeof(error); + unsigned int i; + + if (get_reply_max_size() < sizeof(error)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + + if (!error) + { + for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i) + { + if (sock->errors[i]) + { + error = sock->errors[i]; + break; + } + } + } + + set_reply_data( &error, sizeof(error) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Conor McCarthy : vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_symbol_sampler_data.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: vkd3d Branch: master Commit: b38f94cfdcc1f9223b2cbdbf3e40df38ac03cdee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b38f94cfdcc1f9223b2cbdb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:50 2021 +1000 vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_symbol_sampler_data. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d647cab..aed15b9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1943,8 +1943,7 @@ struct vkd3d_symbol_resource_data struct vkd3d_symbol_sampler_data { - unsigned int register_space; - unsigned int register_index; + struct vkd3d_shader_register_range range; }; struct vkd3d_symbol @@ -5362,8 +5361,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com struct vkd3d_symbol reg_symbol; vkd3d_symbol_make_sampler(&reg_symbol, reg); - reg_symbol.info.sampler.register_space = sampler->range.space; - reg_symbol.info.sampler.register_index = sampler->range.first; + reg_symbol.info.sampler.range = sampler->range; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, sampler)) @@ -7617,8 +7615,8 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(stru if (!(entry = rb_get(&compiler->symbol_table, &key))) return NULL; sampler_symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); - sampler_space = sampler_symbol->info.sampler.register_space; - sampler_index = sampler_symbol->info.sampler.register_index; + sampler_space = sampler_symbol->info.sampler.range.space; + sampler_index = sampler_symbol->info.sampler.range.first; } else {

1 0

Conor McCarthy : vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_symbol_resource_data.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: vkd3d Branch: master Commit: 0c04c1777a2ee1fc8f94e0ee54fcb831a1a6632b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c04c1777a2ee1fc8f94e0e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:49 2021 +1000 vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_symbol_resource_data. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ce819eb..d647cab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1932,8 +1932,7 @@ struct vkd3d_symbol_register_data struct vkd3d_symbol_resource_data { - unsigned int register_space; - unsigned int register_index; + struct vkd3d_shader_register_range range; enum vkd3d_shader_component_type sampled_type; uint32_t type_id; const struct vkd3d_spirv_resource_type *resource_type_info; @@ -5533,8 +5532,8 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, current->sampler_index); symbol.id = var_id; - symbol.info.resource.register_space = resource_space; - symbol.info.resource.register_index = resource_index; + symbol.info.resource.range.space = resource_space; + symbol.info.resource.range.first = resource_index; symbol.info.resource.sampled_type = sampled_type; symbol.info.resource.type_id = image_type_id; symbol.info.resource.resource_type_info = resource_type_info; @@ -5657,8 +5656,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp vkd3d_symbol_make_resource(&resource_symbol, reg); resource_symbol.id = var_id; - resource_symbol.info.resource.register_space = register_space; - resource_symbol.info.resource.register_index = register_index; + resource_symbol.info.resource.range = resource->range; resource_symbol.info.resource.sampled_type = sampled_type; resource_symbol.info.resource.type_id = type_id; resource_symbol.info.resource.resource_type_info = resource_type_info; @@ -7673,7 +7671,7 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource_reg, - symbol->info.resource.register_space, symbol->info.resource.register_index, image->resource_type_info, + symbol->info.resource.range.space, symbol->info.resource.range.first, image->resource_type_info, image->sampled_type, image->structure_stride || image->raw, depth_comparison); if (sampled)

1 0

Conor McCarthy : vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_shader_constant_buffer.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: vkd3d Branch: master Commit: 533d901a24fd4fc990fe85553e260d3053e99406 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=533d901a24fd4fc990fe855… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:48 2021 +1000 vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_shader_constant_buffer. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/spirv.c | 6 +++--- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index cf83c1c..70ab70a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -686,12 +686,12 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction const DWORD *end = &tokens[token_count]; shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_FLOAT, &ins->declaration.cb.src); - ins->declaration.cb.register_index = shader_sm4_map_resource_idx(&ins->declaration.cb.src.reg, priv); + ins->declaration.cb.range.first = shader_sm4_map_resource_idx(&ins->declaration.cb.src.reg, priv); if (opcode_token & VKD3D_SM4_INDEX_TYPE_MASK) ins->flags |= VKD3DSI_INDEXED_DYNAMIC; ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[2].offset; - ins->declaration.cb.register_space = 0; + ins->declaration.cb.range.space = 0; if (shader_is_sm_5_1(priv)) { @@ -702,7 +702,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction } ins->declaration.cb.size = *tokens++; - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.cb.register_space); + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.cb.range.space); } } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7935f12..ce819eb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2403,8 +2403,8 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_constant_buffer( const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_constant_buffer *cb) { - unsigned int register_space = cb->register_space; - unsigned int reg_idx = cb->register_index; + unsigned int register_space = cb->range.space; + unsigned int reg_idx = cb->range.first; unsigned int i; for (i = 0; i < compiler->shader_interface.push_constant_buffer_count; ++i) @@ -5309,7 +5309,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi pointer_type_id, storage_class, 0); vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, - var_id, reg, cb->register_space, cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, false); + var_id, reg, cb->range.space, cb->range.first, VKD3D_SHADER_RESOURCE_BUFFER, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index c51b2eb..2d16714 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1438,7 +1438,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_print_subscript(compiler, ins->declaration.cb.size, NULL); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); - shader_dump_register_space(compiler, ins->declaration.cb.register_space); + shader_dump_register_space(compiler, ins->declaration.cb.range.space); break; case VKD3DSIH_DCL_FUNCTION_BODY: diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e2c8d6f..a8dc3bf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -632,8 +632,8 @@ static void vkd3d_shader_scan_constant_buffer_declaration(struct vkd3d_shader_sc if (!context->scan_descriptor_info) return; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, cb->register_space, - cb->register_index, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_CBV, cb->range.space, + cb->range.first, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0); } static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_context *context, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 285f8cd..5affbae 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -727,7 +727,7 @@ struct vkd3d_shader_constant_buffer { struct vkd3d_shader_src_param src; unsigned int size; - unsigned int register_space, register_index; + struct vkd3d_shader_register_range range; }; struct vkd3d_shader_structured_resource

1 0

Conor McCarthy : vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_shader_sampler.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: vkd3d Branch: master Commit: 1b716f8c28d13547d9338e67d1ffd5fdda34e6b0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1b716f8c28d13547d9338e6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:47 2021 +1000 vkd3d-shader: Store a vkd3d_shader_register_range structure in struct vkd3d_shader_sampler. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/spirv.c | 10 +++++----- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 61acf77..cf83c1c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -716,8 +716,8 @@ static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, if (ins->flags & ~VKD3D_SM4_SAMPLER_COMPARISON) FIXME("Unhandled sampler mode %#x.\n", ins->flags); shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_SAMPLER, &ins->declaration.sampler.src); - ins->declaration.sampler.register_index = shader_sm4_map_resource_idx(&ins->declaration.sampler.src.reg, priv); - shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.register_space); + ins->declaration.sampler.range.first = shader_sm4_map_resource_idx(&ins->declaration.sampler.src.reg, priv); + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.range.space); } static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7a23d31..7935f12 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2443,8 +2443,8 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if ((!resource || (combined_sampler->resource_space == resource->range.space && combined_sampler->resource_index == resource->range.first)) - && (!sampler || (combined_sampler->sampler_space == sampler->register_space - && combined_sampler->sampler_index == sampler->register_index))) + && (!sampler || (combined_sampler->sampler_space == sampler->range.space + && combined_sampler->sampler_index == sampler->range.first))) return true; } @@ -5363,8 +5363,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com struct vkd3d_symbol reg_symbol; vkd3d_symbol_make_sampler(&reg_symbol, reg); - reg_symbol.info.sampler.register_space = sampler->register_space; - reg_symbol.info.sampler.register_index = sampler->register_index; + reg_symbol.info.sampler.register_space = sampler->range.space; + reg_symbol.info.sampler.register_index = sampler->range.first; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, sampler)) @@ -5376,7 +5376,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com ptr_type_id, storage_class, 0); vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(compiler, var_id, reg, - sampler->register_space, sampler->register_index, VKD3D_SHADER_RESOURCE_NONE, false); + sampler->range.space, sampler->range.first, VKD3D_SHADER_RESOURCE_NONE, false); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index c35179a..c51b2eb 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1546,7 +1546,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_dump_register(compiler, &ins->declaration.sampler.src.reg); if (ins->flags == VKD3DSI_SAMPLER_COMPARISON_MODE) shader_addline(buffer, ", comparisonMode"); - shader_dump_register_space(compiler, ins->declaration.sampler.register_space); + shader_dump_register_space(compiler, ins->declaration.sampler.range.space); break; case VKD3DSIH_DCL_TEMPS: diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index df811d3..e2c8d6f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -649,8 +649,8 @@ static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_conte flags = VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE; else flags = 0; - vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->register_space, - sampler->register_index, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); + vkd3d_shader_scan_add_descriptor(context, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, sampler->range.space, + sampler->range.first, VKD3D_SHADER_RESOURCE_NONE, VKD3D_SHADER_RESOURCE_DATA_UINT, flags); } static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cddb3d2..285f8cd 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -720,7 +720,7 @@ struct vkd3d_shader_register_semantic struct vkd3d_shader_sampler { struct vkd3d_shader_src_param src; - unsigned int register_space, register_index; + struct vkd3d_shader_register_range range; }; struct vkd3d_shader_constant_buffer

1 0

Conor McCarthy : vkd3d-shader: Introduce struct vkd3d_shader_register_range.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: vkd3d Branch: master Commit: af2714832b174ff53e7a5df06d79e0e05f0f4794 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=af2714832b174ff53e7a5df… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 14:03:46 2021 +1000 vkd3d-shader: Introduce struct vkd3d_shader_register_range. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 25 +++++++++++++++---------- libs/vkd3d-shader/spirv.c | 8 ++++---- libs/vkd3d-shader/trace.c | 10 +++++----- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 9 +++++++-- 5 files changed, 33 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=af2714832b174ff53e7…

1 0

Conor McCarthy : tests: Add offset tests to test_uav_counters().
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: vkd3d Branch: master Commit: 20e0a241b4472541a95590d42e7736857fee9032 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=20e0a241b4472541a95590d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 24 15:32:42 2021 +1000 tests: Add offset tests to test_uav_counters(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 226 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 123 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=20e0a241b4472541a95…

1 0

Conor McCarthy : vkd3d: Remove fixme for UAV counter offsets.
by Alexandre Julliard 24 Jun '21

24 Jun '21

Module: vkd3d Branch: master Commit: 67c002e7ca9bb6dba54eef51d7d5499a48a9461b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=67c002e7ca9bb6dba54eef5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 23 22:32:20 2021 +1000 vkd3d: Remove fixme for UAV counter offsets. The fixme says the offset is ignored, but it is used when creating the Vulkan buffer view for the counter, and works as expected. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a9d4d46..3a66bb1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2847,9 +2847,6 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ return; } - if (desc->u.Buffer.CounterOffsetInBytes) - FIXME("Ignoring counter offset %"PRIu64".\n", desc->u.Buffer.CounterOffsetInBytes); - flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view_for_resource(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements,

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021