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

Rémi Bernon : kernelbase: Use the same HLOCAL entry pointer alignment as native.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: wine Branch: master Commit: 2fcb072f0376a24ca6d3faf0fc92bddf56c137ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fcb072f0376a24ca6d3faf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 4 10:01:59 2022 +0200 kernelbase: Use the same HLOCAL entry pointer alignment as native. This changes the GlobalUnlock todo_wine as we previously considered the invalid mem handle as a valid pointer, and we now instead check handle validity. Returning TRUE in for an invalid handle doesn't seem very important, and a corner case, and it breaks compatibility and imm32 tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 10 ++++------ dlls/kernel32/tests/heap.c | 17 +---------------- dlls/kernelbase/memory.c | 10 ++++------ 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dbb240d89fc..20505b673ec 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -147,8 +147,6 @@ BOOL WINAPI HeapDestroy( HANDLE heap /* [in] Handle of heap */ ) * Global/local heap functions, keep in sync with kernelbase/memory.c ***********************************************************************/ -#include "pshpack1.h" - struct mem_entry { union @@ -156,15 +154,15 @@ struct mem_entry struct { WORD magic; - void *ptr; BYTE flags; BYTE lock; }; void *next_free; }; + void *ptr; }; -#include "poppack.h" +C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); struct kernelbase_global_data *kernelbase_global_data; @@ -181,7 +179,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = kernelbase_global_data; - if (!((ULONG_PTR)handle & 2)) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (mem->magic != MAGIC_LOCAL_USED) return NULL; return mem; @@ -189,7 +187,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) { - if ((ULONG_PTR)handle & 2) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1))) return NULL; return handle; } diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 476be96cea8..5d6383a49e5 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -368,9 +368,7 @@ static void test_GlobalAlloc(void) mem = GlobalAlloc( GMEM_MOVEABLE, alloc_size ); ok( !!mem, "GlobalAlloc failed, error %lu\n", GetLastError() ); - todo_wine ok( ((UINT_PTR)mem & sizeof(void *)), "got unexpected entry align\n" ); - todo_wine ok( !((UINT_PTR)mem & (sizeof(void *) - 1)), "got unexpected entry align\n" ); entry = mem_entry_from_HANDLE( mem ); @@ -414,9 +412,7 @@ static void test_GlobalAlloc(void) ok( !tmp_mem, "GlobalFree failed, error %lu\n", GetLastError() ); ok( !!entry->flags, "got unexpected flags %#Ix\n", entry->flags ); ok( !((UINT_PTR)entry->flags & sizeof(void *)), "got unexpected ptr align\n" ); - todo_wine_if(sizeof(void *) == 4) ok( !((UINT_PTR)entry->flags & (sizeof(void *) - 1)), "got unexpected ptr align\n" ); - todo_wine ok( !entry->ptr, "got unexpected ptr %p\n", entry->ptr ); mem = GlobalAlloc( GMEM_MOVEABLE | GMEM_DISCARDABLE, 0 ); @@ -543,29 +539,24 @@ static void test_GlobalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); flags = GlobalFlags( invalid_mem ); - todo_wine ok( flags == GMEM_INVALID_HANDLE, "GlobalFlags succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); size = GlobalSize( invalid_mem ); ok( size == 0, "GlobalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = GlobalLock( invalid_mem ); ok( !ptr, "GlobalLock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = GlobalUnlock( invalid_mem ); - ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); todo_wine + ok( ret, "GlobalUnlock failed, error %lu\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp_mem = GlobalReAlloc( invalid_mem, 0, GMEM_MOVEABLE ); ok( !tmp_mem, "GlobalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); /* invalid pointers are caught */ @@ -889,29 +880,23 @@ static void test_LocalAlloc(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); flags = LocalFlags( invalid_mem ); - todo_wine ok( flags == LMEM_INVALID_HANDLE, "LocalFlags succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); size = LocalSize( invalid_mem ); ok( size == 0, "LocalSize succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = LocalLock( invalid_mem ); ok( !ptr, "LocalLock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ret = LocalUnlock( invalid_mem ); ok( !ret, "LocalUnlock succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); tmp_mem = LocalReAlloc( invalid_mem, 0, LMEM_MOVEABLE ); ok( !tmp_mem, "LocalReAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_INVALID_HANDLE, "got error %lu\n", GetLastError() ); /* invalid pointers are caught */ diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 5bdab31589d..086674ab41c 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -585,8 +585,6 @@ struct kernelbase_global_data struct mem_entry *mem_entries_end; }; -#include "pshpack1.h" - struct mem_entry { union @@ -594,15 +592,15 @@ struct mem_entry struct { WORD magic; - void *ptr; BYTE flags; BYTE lock; }; void *next_free; }; + void *ptr; }; -#include "poppack.h" +C_ASSERT(sizeof(struct mem_entry) == 2 * sizeof(void *)); #define MAX_MEM_HANDLES 0x10000 static struct mem_entry mem_entries[MAX_MEM_HANDLES]; @@ -626,7 +624,7 @@ static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = &kernelbase_global_data; - if (!((ULONG_PTR)handle & 2)) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; if (mem->magic != MAGIC_LOCAL_USED) return NULL; return mem; @@ -639,7 +637,7 @@ static inline HLOCAL HLOCAL_from_mem( struct mem_entry *mem ) static inline void *unsafe_ptr_from_HLOCAL( HLOCAL handle ) { - if ((ULONG_PTR)handle & 2) return NULL; + if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1))) return NULL; return handle; }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 bitwise OR instructions.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: vkd3d Branch: master Commit: f22d866ceedfcf6e362216f6a31c129ae70d951b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f22d866ceedfcf6e362216f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 22 13:06:04 2022 -0500 vkd3d-shader/hlsl: Write SM4 bitwise OR instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index fa845dc4..567d311b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1632,6 +1632,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); break; + case HLSL_OP2_BIT_OR: + assert(type_is_integer(dst_type)); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_OR, &expr->node, arg1, arg2); + break; + case HLSL_OP2_DIV: switch (dst_type->base_type) {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 bitwise XOR instructions.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: vkd3d Branch: master Commit: 2959ad74f74f9b48de044fcb7ee1454944db9a5f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2959ad74f74f9b48de044fc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 22 13:06:05 2022 -0500 vkd3d-shader/hlsl: Write SM4 bitwise XOR instructions. 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: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 567d311b..5ca7646f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1637,6 +1637,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_OR, &expr->node, arg1, arg2); break; + case HLSL_OP2_BIT_XOR: + assert(type_is_integer(dst_type)); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_XOR, &expr->node, arg1, arg2); + break; + case HLSL_OP2_DIV: switch (dst_type->base_type) {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 bitwise NOT instructions.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: vkd3d Branch: master Commit: 8e6c526779604b033abe6b3f788f26e6946f5698 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e6c526779604b033abe6b3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 22 13:06:06 2022 -0500 vkd3d-shader/hlsl: Write SM4 bitwise NOT instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 5ca7646f..c1e93e93 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1568,6 +1568,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, } break; + case HLSL_OP1_BIT_NOT: + assert(type_is_integer(dst_type)); + write_sm4_unary_op(buffer, VKD3D_SM4_OP_NOT, &expr->node, arg1, 0); + break; + case HLSL_OP1_CAST: write_sm4_cast(ctx, buffer, expr); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allow mixing "in" and "out" with other modifiers.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: vkd3d Branch: master Commit: 8e07f65595df8383583372c053b0db66f06d9efd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8e07f65595df8383583372c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 16:59:10 2022 -0500 vkd3d-shader/hlsl: Allow mixing "in" and "out" with other modifiers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(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.y | 76 ++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2fbebf01..5da1c68a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1528,6 +1528,16 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); + if (modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(ctx, modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)))) + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on non-parameter variables.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + if (!(var = hlsl_new_var(ctx, v->name, type, v->loc, &v->semantic, modifiers, &v->reg_reservation))) { free_parse_variable_def(v); @@ -2434,8 +2444,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <if_body> if_body -%type <modifiers> input_mod -%type <modifiers> input_mods %type <modifiers> var_modifiers %type <name> any_identifier @@ -2812,54 +2820,21 @@ param_list: } parameter: - input_mods var_modifiers type any_identifier colon_attribute + var_modifiers type any_identifier colon_attribute { struct hlsl_type *type; - unsigned int modifiers = $2; + unsigned int modifiers = $1; - if (!(type = apply_type_modifiers(ctx, $3, &modifiers, @2))) + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN; - $$.modifiers |= modifiers; + $$.modifiers = modifiers; + if (!($$.modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT))) + $$.modifiers |= HLSL_STORAGE_IN; $$.type = type; - $$.name = $4; - $$.semantic = $5.semantic; - $$.reg_reservation = $5.reg_reservation; - } - -input_mods: - %empty - { - $$ = 0; - } - | input_mods input_mod - { - if ($1 & $2) - { - struct vkd3d_string_buffer *string; - - if ((string = hlsl_modifiers_to_string(ctx, $2))) - hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifier \"%s\" was already specified.", string->buffer); - hlsl_release_string_buffer(ctx, string); - YYABORT; - } - $$ = $1 | $2; - } - -input_mod: - KW_IN - { - $$ = HLSL_STORAGE_IN; - } - | KW_OUT - { - $$ = HLSL_STORAGE_OUT; - } - | KW_INOUT - { - $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; + $$.name = $3; + $$.semantic = $4.semantic; + $$.reg_reservation = $4.reg_reservation; } texture_type: @@ -3223,6 +3198,19 @@ var_modifiers: { $$ = add_modifiers(ctx, $2, HLSL_MODIFIER_COLUMN_MAJOR, @1); } + | KW_IN var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_IN, @1); + } + | KW_OUT var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_OUT, @1); + } + | KW_INOUT var_modifiers + { + $$ = add_modifiers(ctx, $2, HLSL_STORAGE_IN | HLSL_STORAGE_OUT, @1); + } + complex_initializer: initializer_expr

1 0

Zebediah Figura : vkd3d-shader/hlsl: Respect the 'nointerpolation' modifier.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: vkd3d Branch: master Commit: e6dabf22bf7926cb78085836798f8a2adedaaba0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e6dabf22bf7926cb7808583… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 16:59:11 2022 -0500 vkd3d-shader/hlsl: Respect the 'nointerpolation' modifier. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(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> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_codegen.c | 9 ++++++--- libs/vkd3d-shader/hlsl_sm4.c | 9 ++++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 64cfe534..8845be37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -352,7 +352,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/logic-operations.shader_test \ tests/max.shader_test \ - tests/nointerpolation.shader_test \ tests/sampler-offset.shader_test \ tests/trigonometry.shader_test endif diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 98be3aeb..a6a574a7 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -34,7 +34,8 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru /* Use the synthetic name for the temp, rather than the uniform, so that we * can write the uniform name into the shader reflection data. */ - if (!(uniform = hlsl_new_var(ctx, temp->name, temp->data_type, temp->loc, NULL, 0, &temp->reg_reservation))) + if (!(uniform = hlsl_new_var(ctx, temp->name, temp->data_type, + temp->loc, NULL, temp->modifiers, &temp->reg_reservation))) return; list_add_before(&temp->scope_entry, &uniform->scope_entry); list_add_tail(&ctx->extern_vars, &uniform->extern_entry); @@ -76,7 +77,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), + type, var->loc, &new_semantic, var->modifiers, NULL))) { hlsl_release_string_buffer(ctx, name); vkd3d_free((void *)new_semantic.name); @@ -147,7 +149,8 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), + type, var->loc, &new_semantic, var->modifiers, NULL))) { vkd3d_free((void *)new_semantic.name); hlsl_release_string_buffer(ctx, name); diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c1e93e93..2dd9cde8 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1203,7 +1203,14 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b } if (profile->type == VKD3D_SHADER_TYPE_PIXEL) - instr.opcode |= VKD3DSIM_LINEAR << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; + { + enum vkd3d_shader_interpolation_mode mode = VKD3DSIM_LINEAR; + + if (var->modifiers & HLSL_STORAGE_NOINTERPOLATION) + mode = VKD3DSIM_CONSTANT; + + instr.opcode |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; + } } else {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Declare integer semantics as having constant interpolation.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: vkd3d Branch: master Commit: c9b766924055fc20bcf4eded683897e615fba9f1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c9b766924055fc20bcf4ede… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 16:59:12 2022 -0500 vkd3d-shader/hlsl: Declare integer semantics as having constant interpolation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(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_sm4.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2dd9cde8..dadb9783 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -25,6 +25,20 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_block *block); +static bool type_is_integer(const struct hlsl_type *type) +{ + switch (type->base_type) + { + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + return true; + + default: + return false; + } +} + bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) { @@ -1206,7 +1220,7 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b { enum vkd3d_shader_interpolation_mode mode = VKD3DSIM_LINEAR; - if (var->modifiers & HLSL_STORAGE_NOINTERPOLATION) + if ((var->modifiers & HLSL_STORAGE_NOINTERPOLATION) || type_is_integer(var->data_type)) mode = VKD3DSIM_CONSTANT; instr.opcode |= mode << VKD3D_SM4_INTERPOLATION_MODE_SHIFT; @@ -1419,20 +1433,6 @@ static void write_sm4_sample(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer write_sm4_instruction(buffer, &instr); } -static bool type_is_integer(const struct hlsl_type *type) -{ - switch (type->base_type) - { - case HLSL_TYPE_BOOL: - case HLSL_TYPE_INT: - case HLSL_TYPE_UINT: - return true; - - default: - return false; - } -} - static bool type_is_float(const struct hlsl_type *type) { return type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 integer addition instructions.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: vkd3d Branch: master Commit: ea93c5c767d5e75e947411aca784f28c2b051b41 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea93c5c767d5e75e947411a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 22 16:59:13 2022 -0500 vkd3d-shader/hlsl: Write SM4 integer addition instructions. 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: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index dadb9783..94765f9e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1634,6 +1634,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); break; + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IADD, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 %s addition expression.", dst_type_string->buffer); }

1 0

Francois Gouget : testbot/web: Better document the job details page reloads.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: d4eb21b18ef5ae4538b6c7b8b6c51352ae032fc6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d4eb21b18ef5ae4538b6c7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:09:00 2022 +0200 testbot/web: Better document the job details page reloads. Also use $SCRIPT_NAME instead of hardcoding the script name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7e1df1f..ccd4044 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -256,7 +256,11 @@ sub OnCancel($) return !1; } - exit($self->{EnclosingPage}->Redirect("/JobDetails.pl?Key=$JobId")); + # Ideally this would use something like GetMoreInfoLink() to rebuild a Get + # URL to preserve which logs and screenshots have been expanded. But the + # anchor would likely be lost anyway. + # So just do a basic reload to refresh the tasks' status. + exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } sub OnRestart($) @@ -278,7 +282,10 @@ sub OnRestart($) return !1; } - exit($self->{EnclosingPage}->Redirect("/JobDetails.pl?Key=$JobId")); + # Reload to refresh the tasks' status. Note that all logs and screenshots + # have been cleared so there is no point specifying which one to open or + # adding an anchor. + exit($self->{EnclosingPage}->Redirect($ENV{"SCRIPT_NAME"} ."?Key=$JobId")); } sub OnAction($$)

1 0

Francois Gouget : testbot/cgi: Remove an incorrect cross-reference in the Perl POD documentation.
by Alexandre Julliard 04 Apr '22

04 Apr '22

Module: tools Branch: master Commit: 1bb3b3ddf3df797a2ab37c35ea8742dd3b2655eb URL: https://source.winehq.org/git/tools.git/?a=commit;h=1bb3b3ddf3df797a2ab37c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 4 18:09:26 2022 +0200 testbot/cgi: Remove an incorrect cross-reference in the Perl POD documentation. PageBase is in fact in WineTestBot::CGI. However referencing WineTestBot from ObjectModel would be an abstraction level violation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 0879557..d7463b5 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -110,8 +110,6 @@ sub _initialize($$$) Sets the function to be used to instantiate a new PageBase object for this website. The resulting object can be accessed through GetPageBase(). -See also ObjectModel::CGI::PageBase. - =back =cut

1 0