April 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplay: Partially implement SetMediaItem().
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: wine Branch: master Commit: 57dd39384b6de15a99cd30e9e2981424909ff833 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57dd39384b6de15a99cd30e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 13 09:03:28 2021 +0300 mfplay: Partially implement SetMediaItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 132 insertions(+), 6 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0c72395ab1e..7360042ee54 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -19,6 +19,7 @@ #define COBJMACROS #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" @@ -28,8 +29,12 @@ #include "wine/debug.h" +#include "initguid.h" + WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +DEFINE_GUID(_MF_TOPO_MEDIA_ITEM, 0x6c1bb4df, 0x59ba, 0x4020, 0x85, 0x0c, 0x35, 0x79, 0xa2, 0x7a, 0xe2, 0x51); + static const WCHAR eventclassW[] = L"MediaPlayerEventCallbackClass"; static LONG startup_refcount; @@ -549,6 +554,14 @@ static const IMFPMediaItemVtbl media_item_vtbl = media_item_GetMetadata, }; +static struct media_item *unsafe_impl_from_IMFPMediaItem(IMFPMediaItem *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == (IMFPMediaItemVtbl *)&media_item_vtbl); + return CONTAINING_RECORD(iface, struct media_item, IMFPMediaItem_iface); +} + static HRESULT create_media_item(IMFPMediaPlayer *player, DWORD_PTR user_data, struct media_item **item) { struct media_item *object; @@ -822,11 +835,106 @@ static HRESULT WINAPI media_player_CreateMediaItemFromObject(IMFPMediaPlayer *if return E_NOTIMPL; } -static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item) +static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major) { - FIXME("%p, %p.\n", iface, item); + IMFMediaTypeHandler *handler; + HRESULT hr; - return E_NOTIMPL; + if (SUCCEEDED(hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler))) + { + hr = IMFMediaTypeHandler_GetMajorType(handler, major); + IMFMediaTypeHandler_Release(handler); + } + + return hr; +} + +static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) +{ + IMFTopologyNode *src_node, *sink_node; + IMFActivate *sar_activate; + IMFStreamDescriptor *sd; + IMFTopology *topology; + unsigned int idx; + BOOL selected; + HRESULT hr; + GUID major; + + if (FAILED(hr = MFCreateTopology(&topology))) + return hr; + + /* FIXME: handle user sinks */ + + /* Use first stream if none selected. */ + if (player->output_window) + { + FIXME("Video streams are not handled.\n"); + } + + /* Set up audio branches for all selected streams. */ + + idx = 0; + while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) + { + if (selected && SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + { + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node))) + { + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)item->source); + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)item->pd); + IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + + IMFTopology_AddNode(topology, src_node); + } + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node))) + { + if (SUCCEEDED(MFCreateAudioRendererActivate(&sar_activate))) + { + IMFTopologyNode_SetObject(sink_node, (IUnknown *)sar_activate); + IMFActivate_Release(sar_activate); + } + + IMFTopology_AddNode(topology, sink_node); + } + + if (src_node && sink_node) + IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + + if (src_node) + IMFTopologyNode_Release(src_node); + if (sink_node) + IMFTopologyNode_Release(sink_node); + } + + IMFStreamDescriptor_Release(sd); + } + + *out = topology; + + return S_OK; +} + +static HRESULT WINAPI media_player_SetMediaItem(IMFPMediaPlayer *iface, IMFPMediaItem *item_iface) +{ + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + struct media_item *item = unsafe_impl_from_IMFPMediaItem(item_iface); + IMFTopology *topology; + HRESULT hr; + + TRACE("%p, %p.\n", iface, item_iface); + + if (item->player != iface) + return E_INVALIDARG; + + if (FAILED(hr = media_item_create_topology(player, item, &topology))) + return hr; + + IMFTopology_SetUnknown(topology, &_MF_TOPO_MEDIA_ITEM, (IUnknown *)item_iface); + hr = IMFMediaSession_SetTopology(player->session, MFSESSION_SETTOPOLOGY_IMMEDIATE, topology); + IMFTopology_Release(topology); + + return hr; } static HRESULT WINAPI media_player_ClearMediaItem(IMFPMediaPlayer *iface) @@ -1267,6 +1375,8 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba MFP_MEDIAPLAYER_STATE state; MFP_EVENT_TYPE event_type; HRESULT hr, event_status; + IMFPMediaItem *item = NULL; + IMFTopology *topology; if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) return S_OK; @@ -1274,6 +1384,12 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent_GetType(session_event, &session_event_type); IMFMediaEvent_GetStatus(session_event, &event_status); + if (SUCCEEDED(IMFMediaSession_GetFullTopology(player->session, MFSESSION_GETFULLTOPOLOGY_CURRENT, 0, &topology))) + { + IMFTopology_GetUnknown(topology, &_MF_TOPO_MEDIA_ITEM, &IID_IMFPMediaItem, (void **)&item); + IMFTopology_Release(topology); + } + switch (session_event_type) { case MESessionStarted: @@ -1302,17 +1418,27 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba /* FIXME: set pMediaItem */ media_player_queue_event(player, event); - IUnknown_Release(&event->IUnknown_iface); + + break; + + case MESessionTopologySet: + + media_event_create(player, MFP_EVENT_TYPE_MEDIAITEM_SET, event_status, &event); + event->u.generic.item = item; + if (event->u.generic.item) + IMFPMediaItem_AddRef(event->u.generic.item); + media_player_queue_event(player, event); break; default: ; } + if (item) + IMFPMediaItem_Release(item); + if (event) - { IUnknown_Release(&event->IUnknown_iface); - } IMFMediaSession_BeginGetEvent(player->session, &player->session_events_callback, NULL); IMFMediaEvent_Release(session_event);

1 0

Zebediah Figura : vkd3d-shader: Rename HLSL_IR_ASSIGNMENT to HLSL_IR_STORE.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: vkd3d Branch: master Commit: 027f994fe0957c20ed18dde03b99f8bf7017d1b9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=027f994fe0957c20ed18dde… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 8 23:38:22 2021 -0500 vkd3d-shader: Rename HLSL_IR_ASSIGNMENT to HLSL_IR_STORE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 76 ++++++++++++++++++++-------------------- libs/vkd3d-shader/hlsl.h | 22 ++++++------ libs/vkd3d-shader/hlsl.y | 50 +++++++++++++------------- libs/vkd3d-shader/hlsl_codegen.c | 59 +++++++++++++++---------------- 4 files changed, 103 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=027f994fe0957c20ed1…

1 0

Zebediah Figura : vkd3d-shader: Allocate temporary registers for variables.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: vkd3d Branch: master Commit: 16163021b928471ba350ae464eb5bd8757a01828 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16163021b928471ba350ae4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 8 23:38:23 2021 -0500 vkd3d-shader: Allocate temporary registers for variables. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 4 +- libs/vkd3d-shader/hlsl.h | 9 ++ libs/vkd3d-shader/hlsl_codegen.c | 187 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 23003f4..f1db47c 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -890,7 +890,7 @@ static void dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_der } } -static const char *debug_writemask(DWORD writemask) +const char *debug_hlsl_writemask(unsigned int writemask) { static const char components[] = {'x', 'y', 'z', 'w'}; char string[5]; @@ -1074,7 +1074,7 @@ static void dump_ir_store(struct vkd3d_string_buffer *buffer, const struct hlsl_ vkd3d_string_buffer_printf(buffer, "= ("); dump_deref(buffer, &store->lhs); if (store->writemask != VKD3DSP_WRITEMASK_ALL) - vkd3d_string_buffer_printf(buffer, "%s", debug_writemask(store->writemask)); + vkd3d_string_buffer_printf(buffer, "%s", debug_hlsl_writemask(store->writemask)); vkd3d_string_buffer_printf(buffer, " "); dump_src(buffer, &store->rhs); vkd3d_string_buffer_printf(buffer, ")"); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c82cd4f..c5a611d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -137,6 +137,13 @@ struct hlsl_struct_field unsigned int reg_offset; }; +struct hlsl_reg +{ + uint32_t id; + unsigned int writemask; + bool allocated; +}; + enum hlsl_ir_node_type { HLSL_IR_CONSTANT, @@ -208,6 +215,7 @@ struct hlsl_ir_var struct list scope_entry, param_entry; unsigned int first_write, last_read; + struct hlsl_reg reg; uint32_t is_input_varying : 1; uint32_t is_output_varying : 1; @@ -493,6 +501,7 @@ static inline void hlsl_src_remove(struct hlsl_src *src) } const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; +const char *debug_hlsl_writemask(unsigned int writemask) DECLSPEC_HIDDEN; struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, const struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 0641aa0..c8d3ed4 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -611,6 +611,191 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl compute_liveness_recurse(entry_func->body, 0, 0); } +struct liveness +{ + size_t size; + struct + { + /* 0 if not live yet. */ + unsigned int last_read; + } *regs; +}; + +static unsigned int get_available_writemask(struct liveness *liveness, + unsigned int first_write, unsigned int component_idx, unsigned int component_count) +{ + unsigned int i, writemask = 0, count = 0; + + for (i = 0; i < 4; ++i) + { + if (liveness->regs[component_idx + i].last_read <= first_write) + { + writemask |= 1u << i; + if (++count == component_count) + return writemask; + } + } + + return 0; +} + +static bool resize_liveness(struct liveness *liveness, size_t new_count) +{ + size_t old_capacity = liveness->size; + + if (!vkd3d_array_reserve((void **)&liveness->regs, &liveness->size, new_count, sizeof(*liveness->regs))) + return false; + + if (liveness->size > old_capacity) + memset(liveness->regs + old_capacity, 0, (liveness->size - old_capacity) * sizeof(*liveness->regs)); + return true; +} + +static struct hlsl_reg allocate_register(struct liveness *liveness, + unsigned int first_write, unsigned int last_read, unsigned int component_count) +{ + unsigned int component_idx, writemask, i; + struct hlsl_reg ret = {0}; + + for (component_idx = 0; component_idx < liveness->size; component_idx += 4) + { + if ((writemask = get_available_writemask(liveness, first_write, component_idx, component_count))) + break; + } + if (component_idx == liveness->size) + { + if (!resize_liveness(liveness, component_idx + 4)) + return ret; + writemask = (1u << component_count) - 1; + } + for (i = 0; i < 4; ++i) + { + if (writemask & (1u << i)) + liveness->regs[component_idx + i].last_read = last_read; + } + ret.id = component_idx / 4; + ret.writemask = writemask; + ret.allocated = true; + return ret; +} + +static bool is_range_available(struct liveness *liveness, unsigned int first_write, + unsigned int component_idx, unsigned int component_count) +{ + unsigned int i; + + for (i = 0; i < component_count; i += 4) + { + if (!get_available_writemask(liveness, first_write, component_idx + i, 4)) + return false; + } + return true; +} + +static struct hlsl_reg allocate_range(struct liveness *liveness, + unsigned int first_write, unsigned int last_read, unsigned int reg_count) +{ + const unsigned int component_count = reg_count * 4; + unsigned int i, component_idx; + struct hlsl_reg ret = {0}; + + for (component_idx = 0; component_idx < liveness->size; component_idx += 4) + { + if (is_range_available(liveness, first_write, component_idx, + min(component_count, liveness->size - component_idx))) + break; + } + if (!resize_liveness(liveness, component_idx + component_count)) + return ret; + + for (i = 0; i < component_count; ++i) + liveness->regs[component_idx + i].last_read = last_read; + ret.id = component_idx / 4; + ret.allocated = true; + return ret; +} + +static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) +{ + if (type->reg_size > 4) + return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, + reg.id + type->reg_size - 1); + return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask)); +} + +static void allocate_variable_temp_register(struct hlsl_ir_var *var, struct liveness *liveness) +{ + if (var->is_input_varying || var->is_output_varying || var->is_uniform) + return; + + if (!var->reg.allocated && var->last_read) + { + if (var->data_type->reg_size > 1) + var->reg = allocate_range(liveness, var->first_write, + var->last_read, var->data_type->reg_size); + else + var->reg = allocate_register(liveness, var->first_write, + var->last_read, var->data_type->dimx); + TRACE("Allocated %s to %s (liveness %u-%u).\n", var->name, + debug_register('r', var->reg, var->data_type), var->first_write, var->last_read); + } +} + +static void allocate_temp_registers_recurse(struct list *instrs, struct liveness *liveness) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + allocate_temp_registers_recurse(&iff->then_instrs, liveness); + allocate_temp_registers_recurse(&iff->else_instrs, liveness); + break; + } + + case HLSL_IR_LOAD: + { + struct hlsl_ir_load *load = hlsl_ir_load(instr); + /* We need to at least allocate a variable for undefs. + * FIXME: We should probably find a way to remove them instead. */ + allocate_variable_temp_register(load->src.var, liveness); + break; + } + + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); + allocate_temp_registers_recurse(&loop->body, liveness); + break; + } + + case HLSL_IR_STORE: + { + struct hlsl_ir_store *store = hlsl_ir_store(instr); + allocate_variable_temp_register(store->lhs.var, liveness); + break; + } + + default: + break; + } + } +} + +/* Simple greedy temporary register allocation pass that just assigns a unique + * index to all (simultaneously live) variables or intermediate values. Agnostic + * as to how many registers are actually available for the current backend, and + * does not handle constants. */ +static void allocate_temp_registers(struct hlsl_ir_function_decl *entry_func) +{ + struct liveness liveness = {0}; + allocate_temp_registers_recurse(entry_func->body, &liveness); +} + int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { struct hlsl_ir_var *var; @@ -648,6 +833,8 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun if (TRACE_ON()) rb_for_each_entry(&ctx->functions, dump_function, NULL); + allocate_temp_registers(entry_func); + if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER; return VKD3D_ERROR_NOT_IMPLEMENTED;

1 0

Zebediah Figura : vkd3d-shader: Allocate temporary registers for anonymous expressions.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: vkd3d Branch: master Commit: e957d3a3462b3e8a90bf656b24e09aab6a168af5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e957d3a3462b3e8a90bf656… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 8 23:38:24 2021 -0500 vkd3d-shader: Allocate temporary registers for anonymous expressions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c5a611d..4122711 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -171,6 +171,7 @@ struct hlsl_ir_node * true even for loops, since currently we can't have a reference to a * value generated in an earlier iteration of the loop. */ unsigned int index, last_read; + struct hlsl_reg reg; }; struct hlsl_src diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index c8d3ed4..cfa021b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -747,6 +747,18 @@ static void allocate_temp_registers_recurse(struct list *instrs, struct liveness LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) { + if (!instr->reg.allocated && instr->last_read) + { + if (instr->data_type->reg_size > 1) + instr->reg = allocate_range(liveness, instr->index, + instr->last_read, instr->data_type->reg_size); + else + instr->reg = allocate_register(liveness, instr->index, + instr->last_read, instr->data_type->dimx); + TRACE("Allocated anonymous expression @%u to %s (liveness %u-%u).\n", instr->index, + debug_register('r', instr->reg, instr->data_type), instr->index, instr->last_read); + } + switch (instr->type) { case HLSL_IR_IF:

1 0

Zebediah Figura : vkd3d-shader: Store the shader type and version in the hlsl_ctx structure.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: vkd3d Branch: master Commit: 60ece9cd6288d70c85a212b3cc0d2373988edcb4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=60ece9cd6288d70c85a212b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 8 23:38:25 2021 -0500 vkd3d-shader: Store the shader type and version in the hlsl_ctx structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 18 +++++------------- libs/vkd3d-shader/hlsl.h | 13 +++++++++++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f1db47c..d797aa1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1370,17 +1370,6 @@ void hlsl_add_function(struct rb_tree *funcs, char *name, struct hlsl_ir_functio rb_put(funcs, func->name, &func->entry); } -struct hlsl_profile_info -{ - const char *name; - enum vkd3d_shader_type type; - DWORD sm_major; - DWORD sm_minor; - DWORD level_major; - DWORD level_minor; - bool sw; -}; - static const struct hlsl_profile_info *get_target_info(const char *target) { unsigned int i; @@ -1556,10 +1545,13 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } } -static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_context *message_context) +static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info *profile, + struct vkd3d_shader_message_context *message_context) { memset(ctx, 0, sizeof(*ctx)); + ctx->profile = profile; + ctx->message_context = message_context; if (!(ctx->source_files = vkd3d_malloc(sizeof(*ctx->source_files)))) @@ -1642,7 +1634,7 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d vkd3d_shader_dump_shader(profile->type, &compile_info->source); - if (!hlsl_ctx_init(&ctx, message_context)) + if (!hlsl_ctx_init(&ctx, profile, message_context)) return VKD3D_ERROR_OUT_OF_MEMORY; if (hlsl_lexer_compile(&ctx, hlsl) == 2) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4122711..3f6abdc 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -390,8 +390,21 @@ struct hlsl_scope struct hlsl_scope *upper; }; +struct hlsl_profile_info +{ + const char *name; + enum vkd3d_shader_type type; + unsigned int major_version; + unsigned int minor_version; + unsigned int major_level; + unsigned int minor_level; + bool software; +}; + struct hlsl_ctx { + const struct hlsl_profile_info *profile; + const char **source_files; unsigned int source_files_count; struct vkd3d_shader_location location;

1 0

Zebediah Figura : vkd3d-shader: Allocate constant registers for anonymous constants.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: vkd3d Branch: master Commit: 21b40522470d298b2c7234084bb1d3cc4a2a1592 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=21b40522470d298b2c72340… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 8 23:38:26 2021 -0500 vkd3d-shader: Allocate constant registers for anonymous constants. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 51 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3f6abdc..923eff5 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -380,6 +380,7 @@ struct hlsl_ir_constant double d[4]; bool b[4]; } value; + struct hlsl_reg reg; }; struct hlsl_scope diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index cfa021b..f7e1156 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -798,6 +798,55 @@ static void allocate_temp_registers_recurse(struct list *instrs, struct liveness } } +static void allocate_const_registers_recurse(struct list *instrs, struct liveness *liveness) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_CONSTANT: + { + struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); + + if (instr->data_type->reg_size > 1) + constant->reg = allocate_range(liveness, 1, UINT_MAX, instr->data_type->reg_size); + else + constant->reg = allocate_register(liveness, 1, UINT_MAX, instr->data_type->dimx); + TRACE("Allocated constant @%u to %s.\n", instr->index, + debug_register('c', constant->reg, instr->data_type)); + break; + } + + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + allocate_const_registers_recurse(&iff->then_instrs, liveness); + allocate_const_registers_recurse(&iff->else_instrs, liveness); + break; + } + + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); + allocate_const_registers_recurse(&loop->body, liveness); + break; + } + + default: + break; + } + } +} + +static void allocate_const_registers(struct hlsl_ir_function_decl *entry_func) +{ + struct liveness liveness = {0}; + + allocate_const_registers_recurse(entry_func->body, &liveness); +} + /* Simple greedy temporary register allocation pass that just assigns a unique * index to all (simultaneously live) variables or intermediate values. Agnostic * as to how many registers are actually available for the current backend, and @@ -846,6 +895,8 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun rb_for_each_entry(&ctx->functions, dump_function, NULL); allocate_temp_registers(entry_func); + if (ctx->profile->major_version < 4) + allocate_const_registers(entry_func); if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER;

1 0

Zebediah Figura : vkd3d-shader: Allocate constant registers for uniforms.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: vkd3d Branch: master Commit: 12e3109e005f31152ee294d4d9301fab2e41cec2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=12e3109e005f31152ee294d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 8 23:38:27 2021 -0500 vkd3d-shader: Allocate constant registers for uniforms. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index f7e1156..e254ced 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -840,9 +840,25 @@ static void allocate_const_registers_recurse(struct list *instrs, struct livenes } } -static void allocate_const_registers(struct hlsl_ir_function_decl *entry_func) +static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func) { struct liveness liveness = {0}; + struct hlsl_ir_var *var; + + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + { + if (var->is_uniform && var->last_read) + { + if (var->data_type->reg_size > 1) + var->reg = allocate_range(&liveness, 1, UINT_MAX, var->data_type->reg_size); + else + { + var->reg = allocate_register(&liveness, 1, UINT_MAX, 4); + var->reg.writemask = (1u << var->data_type->dimx) - 1; + } + TRACE("Allocated %s to %s.\n", var->name, debug_register('c', var->reg, var->data_type)); + } + } allocate_const_registers_recurse(entry_func->body, &liveness); } @@ -896,7 +912,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun allocate_temp_registers(entry_func); if (ctx->profile->major_version < 4) - allocate_const_registers(entry_func); + allocate_const_registers(ctx, entry_func); if (ctx->failed) return VKD3D_ERROR_INVALID_SHADER;

1 0

Francois Gouget : winetest/gather: Fix the name of a generated file in a comment.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: tools Branch: master Commit: 395586d897a73248a27f8bb93f424180e53b348d URL: https://source.winehq.org/git/tools.git/?a=commit;h=395586d897a73248a27f8bb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 12:22:10 2021 +0200 winetest/gather: Fix the name of a generated file in a comment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index 750f0ee..f7dcc16 100755 --- a/winetest/gather +++ b/winetest/gather @@ -899,7 +899,7 @@ EOF # -# Write the data/BUILD/totals.txt file +# Write the data/BUILD/total.txt file # This provides the statistics for the main index page. #

1 0

Francois Gouget : winetest/build-index: Streamline the build check.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: tools Branch: master Commit: 27324e831f00189649fa55df4ba8c157c7830c0b URL: https://source.winehq.org/git/tools.git/?a=commit;h=27324e831f00189649fa55d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 12:22:27 2021 +0200 winetest/build-index: Streamline the build check. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 01533c4..f8a0a88 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -211,10 +211,12 @@ my @too_old; opendir(DIR, "data") or die "could not open the 'data' directory: $!"; foreach my $build (readdir(DIR)) { - next if ($build =~ /^(\.\.?|index\.html|errors\.html|tests)$/); if ($build !~ /^[0-9a-f]{40}$/) { - error("'data/$build' is not a valid build directory\n"); + if ($build !~ /^(\.\.?|errors\.html|index\.html|tests)$/) + { + error("'data/$build' is not a valid build directory\n"); + } next; } next unless -f "data/$build/index.html";

1 0

Francois Gouget : testbot/web: Left-align the text in the legend box.
by Alexandre Julliard 13 Apr '21

13 Apr '21

Module: tools Branch: master Commit: 352d3d2a09f06eb9b8d2a9c024de12485d411944 URL: https://source.winehq.org/git/tools.git/?a=commit;h=352d3d2a09f06eb9b8d2a9c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 12:23:07 2021 +0200 testbot/web: Left-align the text in the legend box. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 2 +- testbot/web/admin/VMDetails.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index bf7f9ba..803fc59 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -421,7 +421,7 @@ sub GenerateFooter($) print "<p></p><div class='CollectionBlock'><table>\n"; print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; - print "<tbody><tr><td class='Record'>\n"; + print "<tbody><tr><td>\n"; print "<p>The <b>Job rate</b> and <b>Task rate</b> show the average hourly rate at which jobs / tasks are submitted to the TestBot. The <b>Revert rate</b> shows how many reverts have been done per hour to run those tasks. Note that the job and task rates provide a first approximation upper limit on the average time a job or task can take to complete.</p>\n"; print "<p>The <b>Busy time</b> indicates how long the TestBot had at least one pending task and the <b>Busy %</b> shows how much of the wall clock time this represents. Note that the busy percentage and average <b>Job completion</b> times can be optimized by balancing the load on the different VM hosts.</p>\n"; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 27ffd2f..19983c6 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -72,7 +72,7 @@ sub GenerateFooter($) my ($self) = @_; print "<p></p><div class='CollectionBlock'><table>\n"; print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; - print "<tbody><tr><td class='Record'>\n"; + print "<tbody><tr><td>\n"; print "<p>The <b>Missions</b> syntax is <i>mission1:mission2:...|mission3|...</i> where <i>mission1</i> and <i>mission2</i> will be run in the same task, and <i>mission3</i> in a separate task.<br>\n"; print "Each mission is composed of a build and options separated by commas: <i>build,option1=value,option2,...</i>. The value can be omitted for boolean options and defaults to true.<br>\n";

1 0