- Wine-Commits - list.winehq.org

Nikolay Sivov : ole32/itemmoniker: Use CRT allocation functions.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 873d53d864bce7d1f7719d5562a88d7d7c0bf909 URL: https://gitlab.winehq.org/wine/wine/-/commit/873d53d864bce7d1f7719d5562a88d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 27 10:48:28 2023 +0200 ole32/itemmoniker: Use CRT allocation functions. --- dlls/ole32/itemmoniker.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 5c69266fc9c..f0c722bbf26 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "winnls.h" #include "wine/debug.h" -#include "wine/heap.h" #include "ole2.h" #include "moniker.h" @@ -100,7 +99,7 @@ static ULONG WINAPI container_lock_Release(IUnknown *iface) { IOleItemContainer_LockContainer(lock->container, FALSE); IOleItemContainer_Release(lock->container); - heap_free(lock); + free(lock); } return refcount; @@ -118,12 +117,12 @@ static HRESULT set_container_lock(IOleItemContainer *container, IBindCtx *pbc) struct container_lock *lock; HRESULT hr; - if (!(lock = heap_alloc(sizeof(*lock)))) + if (!(lock = malloc(sizeof(*lock)))) return E_OUTOFMEMORY; if (FAILED(hr = IOleItemContainer_LockContainer(container, TRUE))) { - heap_free(lock); + free(lock); return hr; } @@ -203,9 +202,9 @@ static ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface) if (!refcount) { if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); - heap_free(moniker->itemName); - heap_free(moniker->itemDelimiter); - heap_free(moniker); + free(moniker->itemName); + free(moniker->itemDelimiter); + free(moniker); } return refcount; @@ -253,18 +252,18 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) if (!str_len) { - heap_free(*ret); + free(*ret); *ret = NULL; return S_OK; } - if (!(buffer = heap_alloc(str_len))) + if (!(buffer = malloc(str_len))) return E_OUTOFMEMORY; IStream_Read(stream, buffer, str_len, &read_len); if (read_len != str_len) { - heap_free(buffer); + free(buffer); return E_FAIL; } @@ -291,7 +290,7 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) goto end; } - str = heap_alloc(str_len + sizeof(WCHAR)); + str = malloc(str_len + sizeof(WCHAR)); if (str) { memcpy(str, &buffer[i + 1], str_len); @@ -301,21 +300,21 @@ static HRESULT item_moniker_load_string_record(IStream *stream, WCHAR **ret) else { lenW = MultiByteToWideChar(CP_ACP, 0, buffer, -1, NULL, 0); - str = heap_alloc(lenW * sizeof(WCHAR)); + str = malloc(lenW * sizeof(WCHAR)); if (str) MultiByteToWideChar(CP_ACP, 0, buffer, -1, str, lenW); } if (str) { - heap_free(*ret); + free(*ret); *ret = str; } else hr = E_OUTOFMEMORY; end: - heap_free(buffer); + free(buffer); return hr; } @@ -361,13 +360,13 @@ static HRESULT WINAPI ItemMonikerImpl_Save(IMoniker *iface, IStream *stream, BOO if (This->itemDelimiter) { str_len = WideCharToMultiByte(CP_ACP, 0, This->itemDelimiter, -1, NULL, 0, NULL, NULL); - str = heap_alloc(str_len); + str = malloc(str_len); WideCharToMultiByte(CP_ACP, 0, This->itemDelimiter, -1, str, str_len, NULL, NULL); hr = IStream_Write(stream, &str_len, sizeof(str_len), NULL); hr = IStream_Write(stream, str, str_len, NULL); - heap_free(str); + free(str); } else { @@ -376,11 +375,11 @@ static HRESULT WINAPI ItemMonikerImpl_Save(IMoniker *iface, IStream *stream, BOO } str_len = WideCharToMultiByte(CP_ACP, 0, This->itemName, -1, NULL, 0, NULL, NULL); - str = heap_alloc(str_len); + str = malloc(str_len); WideCharToMultiByte(CP_ACP, 0, This->itemName, -1, str, str_len, NULL, NULL); hr = IStream_Write(stream, &str_len, sizeof(str_len), NULL); hr = IStream_Write(stream, str, str_len, NULL); - heap_free(str); + free(str); return hr; } @@ -940,7 +939,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon TRACE("%s, %s, %p.\n", debugstr_w(delimiter), debugstr_w(name), ret); - if (!(moniker = heap_alloc_zero(sizeof(*moniker)))) + if (!(moniker = calloc(1, sizeof(*moniker)))) return E_OUTOFMEMORY; moniker->IMoniker_iface.lpVtbl = &VT_ItemMonikerImpl; @@ -948,7 +947,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon moniker->ref = 1; str_len = (lstrlenW(name) + 1) * sizeof(WCHAR); - moniker->itemName = heap_alloc(str_len); + moniker->itemName = malloc(str_len); if (!moniker->itemName) { hr = E_OUTOFMEMORY; @@ -959,7 +958,7 @@ HRESULT WINAPI CreateItemMoniker(const WCHAR *delimiter, const WCHAR *name, IMon if (delimiter) { str_len = (lstrlenW(delimiter) + 1) * sizeof(WCHAR); - moniker->itemDelimiter = heap_alloc(str_len); + moniker->itemDelimiter = malloc(str_len); if (!moniker->itemDelimiter) { hr = E_OUTOFMEMORY;

1 0

Rémi Bernon : winegstreamer: Set the default H264 caps profile to "baseline".
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 34b990fe176672a46a63864b6e121ba88ffecb7e URL: https://gitlab.winehq.org/wine/wine/-/commit/34b990fe176672a46a63864b6e121b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 25 15:21:18 2023 +0200 winegstreamer: Set the default H264 caps profile to "baseline". Some elements such as openh264dec require it to be present. --- dlls/winegstreamer/wg_format.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index da0cd052804..a579a1101d1 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -571,11 +571,10 @@ static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format) GST_FIXME("H264 profile attribute %u not implemented.", format->u.video_h264.profile); /* fallthrough */ case eAVEncH264VProfile_unknown: - profile = NULL; + profile = "baseline"; break; } - if (profile) - gst_caps_set_simple(caps, "profile", G_TYPE_STRING, profile, NULL); + gst_caps_set_simple(caps, "profile", G_TYPE_STRING, profile, NULL); switch (format->u.video_h264.level) {

1 0

Rémi Bernon : winegstreamer: Forbid vaapidecodebin when looking for a specific element.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 0c760ef70de7be47684de82fcd5dc7e71aeb3e22 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c760ef70de7be47684de82fcd5dc7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 17 14:23:37 2023 +0200 winegstreamer: Forbid vaapidecodebin when looking for a specific element. This will eventually fallback to vaapih264dec and similar decoders if VA-API plugins are indeed available. --- dlls/winegstreamer/unixlib.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index 6ffd41e9712..6ed38260536 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -101,6 +101,16 @@ GstElement *find_element(GstElementFactoryListType type, GstCaps *src_caps, GstC for (tmp = transforms; tmp != NULL && element == NULL; tmp = tmp->next) { name = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(tmp->data)); + + if (!strcmp(name, "vaapidecodebin")) + { + /* vaapidecodebin adds asynchronicity which breaks wg_transform synchronous drain / flush + * requirements. Ignore it and use VA-API decoders directly instead. + */ + GST_WARNING("Ignoring vaapidecodebin decoder."); + continue; + } + if (!(element = gst_element_factory_create(GST_ELEMENT_FACTORY(tmp->data), NULL))) GST_WARNING("Failed to create %s element.", name); }

1 0

Rémi Bernon : winegstreamer: Only warn on wg_transform input buffer push errors.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 2a2ed45566eb29c6bef7a610d52f25f65542a9a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a2ed45566eb29c6bef7a610d52f25… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 24 09:38:10 2023 +0200 winegstreamer: Only warn on wg_transform input buffer push errors. Some GStreamer plugins such as openh264 return spurious errors when running the tests. They pass the tests successfull if we simply ignore them. It does not make much difference with returning the error, as they are not supposed to happen anyway, and most of the time the MFT clients don't expect or handle errors. --- dlls/winegstreamer/wg_transform.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index f75d1b4b6df..559e8f976d2 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -740,30 +740,25 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi static bool get_transform_output(struct wg_transform *transform, struct wg_sample *sample) { - GstFlowReturn ret = GST_FLOW_OK; GstBuffer *input_buffer; + GstFlowReturn ret; /* Provide the sample for transform_request_sample to pick it up */ InterlockedIncrement(&sample->refcount); InterlockedExchangePointer((void **)&transform->output_wg_sample, sample); - while (!(transform->output_sample = gst_atomic_queue_pop(transform->output_queue))) + while (!(transform->output_sample = gst_atomic_queue_pop(transform->output_queue)) + && (input_buffer = gst_atomic_queue_pop(transform->input_queue))) { - if (!(input_buffer = gst_atomic_queue_pop(transform->input_queue))) - break; - if ((ret = gst_pad_push(transform->my_src, input_buffer))) - { - GST_ERROR("Failed to push transform input, error %d", ret); - break; - } + GST_WARNING("Failed to push transform input, error %d", ret); } /* Remove the sample so transform_request_sample cannot use it */ if (InterlockedExchangePointer((void **)&transform->output_wg_sample, NULL)) InterlockedDecrement(&sample->refcount); - return ret == GST_FLOW_OK; + return !!transform->output_sample; } NTSTATUS wg_transform_read_data(void *args) @@ -778,12 +773,6 @@ NTSTATUS wg_transform_read_data(void *args) NTSTATUS status; if (!transform->output_sample && !get_transform_output(transform, sample)) - { - wg_allocator_release_sample(transform->allocator, sample, false); - return STATUS_UNSUCCESSFUL; - } - - if (!transform->output_sample) { sample->size = 0; params->result = MF_E_TRANSFORM_NEED_MORE_INPUT;

1 0

Davide Beatrici : wined3d: Fix uninitialized variable warning.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: wine Branch: master Commit: 4a2cebad300ff85722c0ef9b3858349a29273b0d URL: https://gitlab.winehq.org/wine/wine/-/commit/4a2cebad300ff85722c0ef9b385834… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 25 12:33:03 2023 +0200 wined3d: Fix uninitialized variable warning. dlls/wined3d/context_vk.c:2377:42: warning: ‘null_binding’ may be used uninitialized in this function [-Wmaybe-uninitialized] 2377 | *null_buffer_binding = b->binding = null_binding; | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~ --- dlls/wined3d/context_vk.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 10713985e7e..8c021a66bc7 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -244,6 +244,22 @@ static VkStencilOp vk_stencil_op_from_wined3d(enum wined3d_stencil_op op) } } +static bool wined3d_get_unused_stream_index(const struct wined3d_state *state, uint32_t *index) +{ + uint32_t i; + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (!state->streams[i].buffer) + { + *index = i; + return true; + } + } + + return false; +} + static void wined3d_allocator_chunk_vk_lock(struct wined3d_allocator_chunk_vk *chunk_vk) { wined3d_device_vk_allocator_lock(wined3d_device_vk_from_allocator(chunk_vk->c.allocator)); @@ -2339,16 +2355,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte struct wined3d_shader_signature *signature; uint32_t null_binding, location; - for (i = 0; i < ARRAY_SIZE(state->streams); ++i) - { - if (!state->streams[i].buffer) - { - null_binding = i; - break; - } - } - - if (i == ARRAY_SIZE(state->streams)) + if (!wined3d_get_unused_stream_index(state, &null_binding)) { ERR("No streams left for a null buffer binding.\n"); }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Parse SampleCmpLevelZero() method.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: vkd3d Branch: master Commit: a2e85a8a76379cd891ccc0fc14525d65f96c1474 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a2e85a8a76379cd891ccc0fc14525… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 26 11:14:07 2023 +0200 vkd3d-shader/hlsl: Parse SampleCmpLevelZero() method. --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 +++++++- libs/vkd3d-shader/tpf.c | 8 +++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index cf865056..152ec627 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -2445,6 +2445,7 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", [HLSL_RESOURCE_SAMPLE_CMP] = "sample_cmp", + [HLSL_RESOURCE_SAMPLE_CMP_LZ] = "sample_cmp_lz", [HLSL_RESOURCE_SAMPLE_LOD] = "sample_lod", [HLSL_RESOURCE_SAMPLE_LOD_BIAS] = "sample_biased", [HLSL_RESOURCE_SAMPLE_GRAD] = "sample_grad", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f8f894c4..7d02448e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -616,6 +616,7 @@ enum hlsl_resource_load_type HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, HLSL_RESOURCE_SAMPLE_CMP, + HLSL_RESOURCE_SAMPLE_CMP_LZ, HLSL_RESOURCE_SAMPLE_LOD, HLSL_RESOURCE_SAMPLE_LOD_BIAS, HLSL_RESOURCE_SAMPLE_GRAD, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fd0675cd..cf483d82 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3862,7 +3862,7 @@ static bool add_sample_cmp_method_call(struct hlsl_ctx *ctx, struct list *instrs const struct hlsl_type *object_type = object->data_type; const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim); const unsigned int offset_dim = hlsl_offset_dim_count(object_type->sampler_dim); - struct hlsl_resource_load_params load_params = {.type = HLSL_RESOURCE_SAMPLE_CMP}; + struct hlsl_resource_load_params load_params = { 0 }; const struct hlsl_type *sampler_type; struct hlsl_ir_node *load; @@ -3872,6 +3872,11 @@ static bool add_sample_cmp_method_call(struct hlsl_ctx *ctx, struct list *instrs return raise_invalid_method_object_type(ctx, object_type, name, loc); } + if (!strcmp(name, "SampleCmpLevelZero")) + load_params.type = HLSL_RESOURCE_SAMPLE_CMP_LZ; + else + load_params.type = HLSL_RESOURCE_SAMPLE_CMP; + if (params->args_count < 3 || params->args_count > 5 + !!offset_dim) { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, @@ -4191,6 +4196,7 @@ object_methods[] = { "Sample", add_sample_method_call }, { "SampleBias", add_sample_lod_method_call }, { "SampleCmp", add_sample_cmp_method_call }, + { "SampleCmpLevelZero", add_sample_cmp_method_call }, { "SampleGrad", add_sample_grad_method_call }, { "SampleLevel", add_sample_lod_method_call }, }; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 6544aed4..267f2e2d 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4113,6 +4113,10 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer instr.opcode = VKD3D_SM4_OP_SAMPLE_C; break; + case HLSL_RESOURCE_SAMPLE_CMP_LZ: + instr.opcode = VKD3D_SM4_OP_SAMPLE_C_LZ; + break; + case HLSL_RESOURCE_SAMPLE_LOD: instr.opcode = VKD3D_SM4_OP_SAMPLE_LOD; break; @@ -4159,7 +4163,8 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer sm4_src_from_node(&instr.srcs[4], load->ddy.node, VKD3DSP_WRITEMASK_ALL); instr.src_count += 2; } - else if (load->load_type == HLSL_RESOURCE_SAMPLE_CMP) + else if (load->load_type == HLSL_RESOURCE_SAMPLE_CMP + || load->load_type == HLSL_RESOURCE_SAMPLE_CMP_LZ) { sm4_src_from_node(&instr.srcs[3], load->cmp.node, VKD3DSP_WRITEMASK_ALL); ++instr.src_count; @@ -4963,6 +4968,7 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, case HLSL_RESOURCE_SAMPLE: case HLSL_RESOURCE_SAMPLE_CMP: + case HLSL_RESOURCE_SAMPLE_CMP_LZ: case HLSL_RESOURCE_SAMPLE_LOD: case HLSL_RESOURCE_SAMPLE_LOD_BIAS: case HLSL_RESOURCE_SAMPLE_GRAD:

1 0

Giovanni Mascellani : vkd3d-shader/tpf: Do not emit HLSL_IR_CONSTANT instructions.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: vkd3d Branch: master Commit: 7c360330d74f5c2f6de962355927ee6e7d7dfbf0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7c360330d74f5c2f6de962355927e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 26 14:40:30 2023 +0200 vkd3d-shader/tpf: Do not emit HLSL_IR_CONSTANT instructions. Since constants are now inlined. --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++++ libs/vkd3d-shader/tpf.c | 29 +++++++---------------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index a9ef7f2d..2b6c595a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3004,6 +3004,10 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) { + /* In SM4 all constants are inlined. */ + if (ctx->profile->major_version >= 4 && instr->type == HLSL_IR_CONSTANT) + continue; + if (!instr->reg.allocated && instr->last_read) { instr->reg = allocate_numeric_registers_for_type(ctx, allocator, instr->index, instr->last_read, diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index de4e9bc7..60948d64 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4003,24 +4003,6 @@ static void write_sm4_binary_op_with_two_destinations(struct vkd3d_bytecode_buff write_sm4_instruction(buffer, &instr); } -static void write_sm4_constant(struct hlsl_ctx *ctx, - struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_constant *constant) -{ - const unsigned int dimx = constant->node.data_type->dimx; - struct sm4_instruction instr; - - memset(&instr, 0, sizeof(instr)); - instr.opcode = VKD3D_SM4_OP_MOV; - - sm4_dst_from_node(&instr.dsts[0], &constant->node); - instr.dst_count = 1; - - sm4_src_from_constant_value(&instr.srcs[0], &constant->value, dimx, instr.dsts[0].writemask); - instr.src_count = 1; - - write_sm4_instruction(buffer, &instr); -} - static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, const struct hlsl_deref *resource, const struct hlsl_ir_node *coords, @@ -5097,16 +5079,19 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * } assert(instr->data_type->class == HLSL_CLASS_SCALAR || instr->data_type->class == HLSL_CLASS_VECTOR); + + if (!instr->reg.allocated) + { + assert(instr->type == HLSL_IR_CONSTANT); + continue; + } } switch (instr->type) { case HLSL_IR_CALL: - vkd3d_unreachable(); - case HLSL_IR_CONSTANT: - write_sm4_constant(ctx, buffer, hlsl_ir_constant(instr)); - break; + vkd3d_unreachable(); case HLSL_IR_EXPR: write_sm4_expr(ctx, buffer, hlsl_ir_expr(instr));

1 0

Giovanni Mascellani : vkd3d-shader/tpf: Emit constant values inline.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: vkd3d Branch: master Commit: a471c5567acaf467292cdfb9c061e2213b348805 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a471c5567acaf467292cdfb9c061e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 26 14:24:07 2023 +0200 vkd3d-shader/tpf: Emit constant values inline. --- libs/vkd3d-shader/tpf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index feea213d..de4e9bc7 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3540,6 +3540,14 @@ static void sm4_src_from_node(struct sm4_src_register *src, { unsigned int writemask; + if (instr->type == HLSL_IR_CONSTANT) + { + struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); + + sm4_src_from_constant_value(src, &constant->value, instr->data_type->dimx, map_writemask); + return; + } + sm4_register_from_node(&src->reg, &writemask, &src->swizzle_type, instr); if (src->swizzle_type == VKD3D_SM4_SWIZZLE_VEC4) src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask);

1 0

Giovanni Mascellani : vkd3d-shader/tpf: Move sm4_src_from_constant_value() above.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: vkd3d Branch: master Commit: a7de09d418308fbb3eac8cf28fc45796aa8462ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a7de09d418308fbb3eac8cf28fc45… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri May 26 14:10:11 2023 +0200 vkd3d-shader/tpf: Move sm4_src_from_constant_value() above. So that it can be used by sm4_src_from_node() in later commits. --- libs/vkd3d-shader/tpf.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 896cb0bb..feea213d 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3512,16 +3512,6 @@ static void sm4_dst_from_node(struct sm4_dst_register *dst, const struct hlsl_ir sm4_register_from_node(&dst->reg, &dst->writemask, &swizzle_type, instr); } -static void sm4_src_from_node(struct sm4_src_register *src, - const struct hlsl_ir_node *instr, unsigned int map_writemask) -{ - unsigned int writemask; - - sm4_register_from_node(&src->reg, &writemask, &src->swizzle_type, instr); - if (src->swizzle_type == VKD3D_SM4_SWIZZLE_VEC4) - src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask); -} - static void sm4_src_from_constant_value(struct sm4_src_register *src, const struct hlsl_constant_value *value, unsigned int width, unsigned int map_writemask) { @@ -3545,6 +3535,16 @@ static void sm4_src_from_constant_value(struct sm4_src_register *src, } } +static void sm4_src_from_node(struct sm4_src_register *src, + const struct hlsl_ir_node *instr, unsigned int map_writemask) +{ + unsigned int writemask; + + sm4_register_from_node(&src->reg, &writemask, &src->swizzle_type, instr); + if (src->swizzle_type == VKD3D_SM4_SWIZZLE_VEC4) + src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask); +} + static uint32_t sm4_encode_register(const struct sm4_register *reg) { return (reg->type << VKD3D_SM4_REGISTER_TYPE_SHIFT)

1 0

Nikolay Sivov : vkd3d-shader/tpf: Write out comparison mode sampler declarations and corresponding sampling instruction.
by Alexandre Julliard May 29, 2023

May 29, 2023

Module: vkd3d Branch: master Commit: c33219c97b06812f65072f86782f446d44ca6474 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c33219c97b06812f65072f86782f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 16 20:59:34 2023 +0200 vkd3d-shader/tpf: Write out comparison mode sampler declarations and corresponding sampling instruction. --- libs/vkd3d-shader/tpf.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d97b6de5..6544aed4 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3680,23 +3680,24 @@ static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, static void write_sm4_dcl_samplers(struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_var *var) { unsigned int i, count = var->data_type->reg_size[HLSL_REGSET_SAMPLERS]; - struct sm4_instruction instr; + struct sm4_instruction instr = + { + .opcode = VKD3D_SM4_OP_DCL_SAMPLER, + + .dsts[0].reg.type = VKD3D_SM4_RT_SAMPLER, + .dsts[0].reg.idx_count = 1, + .dst_count = 1, + }; + + if (var->data_type->sampler_dim == HLSL_SAMPLER_DIM_COMPARISON) + instr.opcode |= VKD3D_SM4_SAMPLER_COMPARISON << VKD3D_SM4_SAMPLER_MODE_SHIFT; for (i = 0; i < count; ++i) { if (!var->objects_usage[HLSL_REGSET_SAMPLERS][i].used) continue; - instr = (struct sm4_instruction) - { - .opcode = VKD3D_SM4_OP_DCL_SAMPLER, - - .dsts[0].reg.type = VKD3D_SM4_RT_SAMPLER, - .dsts[0].reg.idx = {var->regs[HLSL_REGSET_SAMPLERS].id + i}, - .dsts[0].reg.idx_count = 1, - .dst_count = 1, - }; - + instr.dsts[0].reg.idx[0] = var->regs[HLSL_REGSET_SAMPLERS].id + i; write_sm4_instruction(buffer, &instr); } } @@ -4108,6 +4109,10 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer instr.opcode = VKD3D_SM4_OP_SAMPLE; break; + case HLSL_RESOURCE_SAMPLE_CMP: + instr.opcode = VKD3D_SM4_OP_SAMPLE_C; + break; + case HLSL_RESOURCE_SAMPLE_LOD: instr.opcode = VKD3D_SM4_OP_SAMPLE_LOD; break; @@ -4154,6 +4159,11 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer sm4_src_from_node(&instr.srcs[4], load->ddy.node, VKD3DSP_WRITEMASK_ALL); instr.src_count += 2; } + else if (load->load_type == HLSL_RESOURCE_SAMPLE_CMP) + { + sm4_src_from_node(&instr.srcs[3], load->cmp.node, VKD3DSP_WRITEMASK_ALL); + ++instr.src_count; + } write_sm4_instruction(buffer, &instr); } @@ -4952,6 +4962,7 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, break; case HLSL_RESOURCE_SAMPLE: + case HLSL_RESOURCE_SAMPLE_CMP: case HLSL_RESOURCE_SAMPLE_LOD: case HLSL_RESOURCE_SAMPLE_LOD_BIAS: case HLSL_RESOURCE_SAMPLE_GRAD: @@ -4982,10 +4993,6 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, &load->sampler, coords, HLSL_SWIZZLE(W, W, W, W), texel_offset); break; - - case HLSL_RESOURCE_SAMPLE_CMP: - hlsl_fixme(ctx, &load->node.loc, "SM4 sample-comparison expression."); - break; } }

1 0