- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Forbid recursive calls.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 9c817e5e6d8bfc639a4a17bb30a2b30b9db8477f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9c817e5e6d8bfc639a4a17bb30a2b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Sep 11 11:20:32 2021 -0500 vkd3d-shader/hlsl: Forbid recursive calls. --- libs/vkd3d-shader/hlsl_codegen.c | 47 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl-function.shader_test | 38 ++++++++++++++++++++++++++ tests/shader_runner.c | 10 +++++++ 4 files changed, 96 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5076274e..9b644d1b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -457,6 +457,48 @@ static bool transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx return progress; } +struct recursive_call_ctx +{ + const struct hlsl_ir_function_decl **backtrace; + size_t count, capacity; +}; + +static bool find_recursive_calls(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct recursive_call_ctx *call_ctx = context; + struct hlsl_ir_function_decl *decl; + const struct hlsl_ir_call *call; + size_t i; + + if (instr->type != HLSL_IR_CALL) + return false; + call = hlsl_ir_call(instr); + decl = call->decl; + + for (i = 0; i < call_ctx->count; ++i) + { + if (call_ctx->backtrace[i] == decl) + { + hlsl_error(ctx, &call->node.loc, VKD3D_SHADER_ERROR_HLSL_RECURSIVE_CALL, + "Recursive call to \"%s\".", decl->func->name); + /* Native returns E_NOTIMPL instead of E_FAIL here. */ + ctx->result = VKD3D_ERROR_NOT_IMPLEMENTED; + return false; + } + } + + if (!hlsl_array_reserve(ctx, (void **)&call_ctx->backtrace, &call_ctx->capacity, + call_ctx->count + 1, sizeof(*call_ctx->backtrace))) + return false; + call_ctx->backtrace[call_ctx->count++] = decl; + + transform_ir(ctx, find_recursive_calls, &decl->body, call_ctx); + + --call_ctx->count; + + return false; +} + /* Lower casts from vec1 to vecN to swizzles. */ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -2628,12 +2670,17 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry { const struct hlsl_profile_info *profile = ctx->profile; struct hlsl_block *const body = &entry_func->body; + struct recursive_call_ctx recursive_call_ctx; struct hlsl_ir_var *var; unsigned int i; bool progress; list_move_head(&body->instrs, &ctx->static_initializers); + memset(&recursive_call_ctx, 0, sizeof(recursive_call_ctx)); + transform_ir(ctx, find_recursive_calls, body, &recursive_call_ctx); + vkd3d_free(recursive_call_ctx.backtrace); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) { if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 74edf049..5002a13c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -121,6 +121,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF = 5022, VKD3D_SHADER_ERROR_HLSL_INVALID_THREAD_COUNT = 5023, VKD3D_SHADER_ERROR_HLSL_MISSING_ATTRIBUTE = 5024, + VKD3D_SHADER_ERROR_HLSL_RECURSIVE_CALL = 5025, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index e8bb80c4..eee6f2d1 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -162,3 +162,41 @@ float4 main() : sv_target [test] draw quad todo probe all rgba (0.6, 0.1, 0.5, 0) + +% Recursion is forbidden. + +[pixel shader notimpl] + +void bar(); + +void foo() +{ + bar(); +} + +void bar() +{ + foo(); +} + +float4 main() : sv_target +{ + foo(); + return 0; +} + +[pixel shader notimpl todo] + +% Even trivially finite recursion is forbidden. + +void func(bool x) +{ + if (x) + func(false); +} + +float4 main() : sv_target +{ + func(true); + return 0; +} diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 0ed070a1..0f205bfe 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -893,6 +893,16 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const state = STATE_SHADER_PIXEL_TODO; expect_hr = E_FAIL; } + else if (!strcmp(line, "[pixel shader notimpl]\n")) + { + state = STATE_SHADER_PIXEL; + expect_hr = E_NOTIMPL; + } + else if (!strcmp(line, "[pixel shader notimpl todo]\n")) + { + state = STATE_SHADER_PIXEL_TODO; + expect_hr = E_NOTIMPL; + } else if (sscanf(line, "[sampler %u]\n", &index)) { state = STATE_SAMPLER;

1 0

Zebediah Figura : tests/shader_runner: Explicitly track the expected shader compilation HRESULT instead of using a boolean flag.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 503be4243c83318d8279ee21ae9cc402803de4ae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/503be4243c83318d8279ee21ae9cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 16 16:08:01 2023 -0600 tests/shader_runner: Explicitly track the expected shader compilation HRESULT instead of using a boolean flag. --- tests/shader_runner.c | 52 ++++++++++++++++++--------------------------------- 1 file changed, 18 insertions(+), 34 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 4750b946..0ed070a1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -82,10 +82,6 @@ enum parse_state STATE_SAMPLER, STATE_SHADER_COMPUTE, STATE_SHADER_COMPUTE_TODO, - STATE_SHADER_INVALID_COMPUTE, - STATE_SHADER_INVALID_COMPUTE_TODO, - STATE_SHADER_INVALID_PIXEL, - STATE_SHADER_INVALID_PIXEL_TODO, STATE_SHADER_PIXEL, STATE_SHADER_PIXEL_TODO, STATE_SHADER_VERTEX, @@ -661,7 +657,7 @@ unsigned int get_vb_stride(const struct shader_runner *runner, unsigned int slot return stride; } -static void compile_shader(struct shader_runner *runner, const char *source, size_t len, const char *type, bool invalid) +static void compile_shader(struct shader_runner *runner, const char *source, size_t len, const char *type, HRESULT expect) { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; @@ -678,10 +674,7 @@ static void compile_shader(struct shader_runner *runner, const char *source, siz sprintf(profile, "%s_%s", type, shader_models[runner->minimum_shader_model]); hr = D3DCompile(source, len, NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); - if (invalid) - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - else - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == expect, "Got unexpected hr %#x.\n", hr); if (hr == S_OK) { ID3D10Blob_Release(blob); @@ -708,6 +701,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const unsigned int i, line_number = 0; const char *filename = NULL; char *shader_source = NULL; + HRESULT expect_hr = S_OK; char line[256]; FILE *f; @@ -766,7 +760,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_SHADER_COMPUTE: case STATE_SHADER_COMPUTE_TODO: todo_if (state == STATE_SHADER_COMPUTE_TODO) - compile_shader(runner, shader_source, shader_source_len, "cs", false); + compile_shader(runner, shader_source, shader_source_len, "cs", expect_hr); free(runner->cs_source); runner->cs_source = shader_source; shader_source = NULL; @@ -777,7 +771,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_SHADER_PIXEL: case STATE_SHADER_PIXEL_TODO: todo_if (state == STATE_SHADER_PIXEL_TODO) - compile_shader(runner, shader_source, shader_source_len, "ps", false); + compile_shader(runner, shader_source, shader_source_len, "ps", expect_hr); free(runner->ps_source); runner->ps_source = shader_source; shader_source = NULL; @@ -786,7 +780,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const break; case STATE_SHADER_VERTEX: - compile_shader(runner, shader_source, shader_source_len, "vs", false); + compile_shader(runner, shader_source, shader_source_len, "vs", expect_hr); free(runner->vs_source); runner->vs_source = shader_source; shader_source = NULL; @@ -794,20 +788,6 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const shader_source_size = 0; break; - case STATE_SHADER_INVALID_COMPUTE: - case STATE_SHADER_INVALID_COMPUTE_TODO: - todo_if (state == STATE_SHADER_INVALID_COMPUTE_TODO) - compile_shader(runner, shader_source, shader_source_len, "cs", true); - shader_source_len = 0; - break; - - case STATE_SHADER_INVALID_PIXEL: - case STATE_SHADER_INVALID_PIXEL_TODO: - todo_if (state == STATE_SHADER_INVALID_PIXEL_TODO) - compile_shader(runner, shader_source, shader_source_len, "ps", true); - shader_source_len = 0; - break; - case STATE_PREPROC_INVALID: { ID3D10Blob *blob = NULL, *errors = NULL; @@ -872,18 +852,22 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const if (!strcmp(line, "[compute shader]\n")) { state = STATE_SHADER_COMPUTE; + expect_hr = S_OK; } else if (!strcmp(line, "[compute shader todo]\n")) { state = STATE_SHADER_COMPUTE_TODO; + expect_hr = S_OK; } else if (!strcmp(line, "[compute shader fail]\n")) { - state = STATE_SHADER_INVALID_COMPUTE; + state = STATE_SHADER_COMPUTE; + expect_hr = E_FAIL; } else if (!strcmp(line, "[compute shader fail todo]\n")) { - state = STATE_SHADER_INVALID_COMPUTE_TODO; + state = STATE_SHADER_COMPUTE_TODO; + expect_hr = E_FAIL; } else if (!strcmp(line, "[require]\n")) { @@ -892,18 +876,22 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const else if (!strcmp(line, "[pixel shader]\n")) { state = STATE_SHADER_PIXEL; + expect_hr = S_OK; } else if (!strcmp(line, "[pixel shader todo]\n")) { state = STATE_SHADER_PIXEL_TODO; + expect_hr = S_OK; } else if (!strcmp(line, "[pixel shader fail]\n")) { - state = STATE_SHADER_INVALID_PIXEL; + state = STATE_SHADER_PIXEL; + expect_hr = E_FAIL; } else if (!strcmp(line, "[pixel shader fail todo]\n")) { - state = STATE_SHADER_INVALID_PIXEL_TODO; + state = STATE_SHADER_PIXEL_TODO; + expect_hr = E_FAIL; } else if (sscanf(line, "[sampler %u]\n", &index)) { @@ -1012,10 +1000,6 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_PREPROC_INVALID: case STATE_SHADER_COMPUTE: case STATE_SHADER_COMPUTE_TODO: - case STATE_SHADER_INVALID_COMPUTE: - case STATE_SHADER_INVALID_COMPUTE_TODO: - case STATE_SHADER_INVALID_PIXEL: - case STATE_SHADER_INVALID_PIXEL_TODO: case STATE_SHADER_PIXEL: case STATE_SHADER_PIXEL_TODO: case STATE_SHADER_VERTEX:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Store a non-constant hlsl_ir_function_decl pointer in struct hlsl_ir_call.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 521f22e57a5274c52e086f524d85e29cabf530dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/521f22e57a5274c52e086f524d85e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 16 13:14:09 2023 -0600 vkd3d-shader/hlsl: Store a non-constant hlsl_ir_function_decl pointer in struct hlsl_ir_call. --- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/hlsl.h | 4 ++-- libs/vkd3d-shader/hlsl.y | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8cca8d47..13aac3d4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -931,7 +931,7 @@ struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl return store; } -struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *decl, +struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *decl, const struct vkd3d_shader_location *loc) { struct hlsl_ir_call *call; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 50e244e3..059abe18 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -420,7 +420,7 @@ struct hlsl_ir_function_decl struct hlsl_ir_call { struct hlsl_ir_node node; - const struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function_decl *decl; }; struct hlsl_ir_if @@ -983,7 +983,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_exp struct hlsl_ir_constant *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc); struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc); -struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, const struct hlsl_ir_function_decl *decl, +struct hlsl_ir_node *hlsl_new_call(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *decl, const struct vkd3d_shader_location *loc); struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *node, struct hlsl_type *type, const struct vkd3d_shader_location *loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fe54b1f0..b3e38d1f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2217,12 +2217,12 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t struct find_function_call_args { const struct parse_initializer *params; - const struct hlsl_ir_function_decl *decl; + struct hlsl_ir_function_decl *decl; }; static void find_function_call_exact(struct rb_entry *entry, void *context) { - const struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, const struct hlsl_ir_function_decl, entry); + struct hlsl_ir_function_decl *decl = RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry); struct find_function_call_args *args = context; const struct hlsl_ir_var *param; unsigned int i = 0; @@ -2237,7 +2237,7 @@ static void find_function_call_exact(struct rb_entry *entry, void *context) args->decl = decl; } -static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, +static struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *ctx, const char *name, const struct parse_initializer *params) { struct find_function_call_args args = {.params = params}; @@ -2949,8 +2949,8 @@ static int intrinsic_function_name_compare(const void *a, const void *b) static struct list *add_call(struct hlsl_ctx *ctx, const char *name, struct parse_initializer *args, const struct vkd3d_shader_location *loc) { - const struct hlsl_ir_function_decl *decl; struct intrinsic_function *intrinsic; + struct hlsl_ir_function_decl *decl; if ((decl = find_function_call(ctx, name, args))) {

1 0

Francisco Casas : tests: Test step() intrinsic.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 4e1a4a76d9c577d54062adfd7c558ac570908035 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4e1a4a76d9c577d54062adfd7c558… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jan 13 17:37:12 2023 -0300 tests: Test step() intrinsic. --- Makefile.am | 1 + tests/step.shader_test | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/Makefile.am b/Makefile.am index ed94f086..051d34ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ vkd3d_shader_tests = \ tests/saturate.shader_test \ tests/shader-interstage-interface.shader_test \ tests/sqrt.shader_test \ + tests/step.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/step.shader_test b/tests/step.shader_test new file mode 100644 index 00000000..8a8b1fd2 --- /dev/null +++ b/tests/step.shader_test @@ -0,0 +1,55 @@ +[pixel shader todo] +uniform float4 f, p; + +float4 main() : sv_target +{ + return step(f, p); +} + +[test] +uniform 0 float4 5.0 -2.6 3.0 2.0 +uniform 4 float4 1.0 -4.3 3.0 4.0 +todo draw quad +todo probe all rgba (0.0, 0.0, 1.0, 1.0) + + +[pixel shader todo] +float4 main() : sv_target +{ + float2x2 a = {1, 2, 3, 4}; + float b = {3}; + + return float4(step(a, b)); +} + +[test] +todo draw quad +todo probe all rgba (1.0, 1.0, 1.0, 0.0) + + +[pixel shader fail] +float4 main() : sv_target +{ + float2x2 a = {1, 2, 3, 4}; + float1 b = {3}; + + step(a, b); + return 0; +} + + +[pixel shader todo] +float4 main() : sv_target +{ + float3x2 a = {8, 0, + 0, 8, + 8, 8}; + float2x3 b = {0, 8, 0, + 8, 0, 0}; + + return float4(step(a, b)); +} + +[test] +todo draw quad +todo probe all rgba (0.0, 1.0, 1.0, 0.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Parse sqrt() intrinsic.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 6fbf2b3e75ed7f85c413233a3326b79e0631d9d8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6fbf2b3e75ed7f85c413233a3326b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jan 13 15:58:15 2023 -0300 vkd3d-shader/hlsl: Parse sqrt() intrinsic. --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ tests/sqrt.shader_test | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 35be0f12..88bfabe4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2817,6 +2817,17 @@ static bool intrinsic_smoothstep(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_sqrt(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, arg, loc); +} + static bool intrinsic_transpose(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2905,6 +2916,7 @@ intrinsic_functions[] = {"saturate", 1, true, intrinsic_saturate}, {"sin", 1, true, intrinsic_sin}, {"smoothstep", 3, true, intrinsic_smoothstep}, + {"sqrt", 1, true, intrinsic_sqrt}, {"transpose", 1, true, intrinsic_transpose}, }; diff --git a/tests/sqrt.shader_test b/tests/sqrt.shader_test index 81bf99a4..5d048b4f 100644 --- a/tests/sqrt.shader_test +++ b/tests/sqrt.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader] uniform float4 f; float4 main() : sv_target @@ -8,5 +8,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 9.0 32.3 46.5 -todo draw quad -todo probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1 +draw quad +probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1

1 0

Francisco Casas : vkd3d-shader/hlsl: Support sin() intrinsic.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 3239ea5ff1c8c40a597f42cea93fb19877895534 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3239ea5ff1c8c40a597f42cea93fb… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jan 13 15:22:13 2023 -0300 vkd3d-shader/hlsl: Support sin() intrinsic. --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 28 ++++++++++++++++++++++++++++ tests/trigonometry.shader_test | 6 +++--- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7d3b23cf..d096856d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2736,6 +2736,17 @@ static bool intrinsic_saturate(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SAT, arg, loc); } +static bool intrinsic_sin(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SIN, arg, loc); +} + /* smoothstep(a, b, x) = p^2 (3 - 2p), where p = saturate((x - a)/(b - a)) */ static bool intrinsic_smoothstep(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) @@ -2880,6 +2891,7 @@ intrinsic_functions[] = {"pow", 2, true, intrinsic_pow}, {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, + {"sin", 1, true, intrinsic_sin}, {"smoothstep", 3, true, intrinsic_smoothstep}, {"transpose", 1, true, intrinsic_transpose}, }; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index d9d05e04..c7231826 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1319,6 +1319,29 @@ static void write_sm4_unary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_ write_sm4_instruction(buffer, &instr); } +static void write_sm4_unary_op_with_two_destinations(struct vkd3d_bytecode_buffer *buffer, + enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, unsigned dst_idx, + const struct hlsl_ir_node *src) +{ + struct sm4_instruction instr; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = opcode; + + assert(dst_idx < ARRAY_SIZE(instr.dsts)); + sm4_dst_from_node(&instr.dsts[dst_idx], dst); + assert(1 - dst_idx >= 0); + instr.dsts[1 - dst_idx].reg.type = VKD3D_SM4_RT_NULL; + instr.dsts[1 - dst_idx].reg.dim = VKD3D_SM4_DIMENSION_NONE; + instr.dsts[1 - dst_idx].reg.idx_count = 0; + instr.dst_count = 2; + + sm4_src_from_node(&instr.srcs[0], src, instr.dsts[dst_idx].writemask); + instr.src_count = 1; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) { @@ -1738,6 +1761,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, &expr->node, arg1, 0); break; + case HLSL_OP1_SIN: + assert(type_is_float(dst_type)); + write_sm4_unary_op_with_two_destinations(buffer, VKD3D_SM4_OP_SINCOS, &expr->node, 0, arg1); + break; + case HLSL_OP1_SQRT: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_SQRT, &expr->node, arg1, 0); diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test index fef85ca0..919eea20 100644 --- a/tests/trigonometry.shader_test +++ b/tests/trigonometry.shader_test @@ -31,7 +31,7 @@ probe (14, 0) rgba ( 0.99060736, 0.13673722, 0.0, 0.0) 1024 probe (15, 0) rgba ( 0.65028784, -0.75968791, 0.0, 0.0) 1024 -[pixel shader todo] +[pixel shader] uniform float4 a; float4 main() : sv_target @@ -41,8 +41,8 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.52359877 2.61799387 3.14159265 -todo draw quad -todo probe all rgba (0.0, 500.0, 500.0, 0.0) +draw quad +probe all rgba (0.0, 500.0, 500.0, 0.0) [pixel shader todo]

1 0

Francisco Casas : vkd3d-shader/hlsl: Add additional tests for sin() and cos().
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: b65c4501014f2604ca2494d0bc8df35021792dab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b65c4501014f2604ca2494d0bc8df… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 16 17:25:50 2023 -0300 vkd3d-shader/hlsl: Add additional tests for sin() and cos(). --- tests/trigonometry.shader_test | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/trigonometry.shader_test b/tests/trigonometry.shader_test index afc09221..fef85ca0 100644 --- a/tests/trigonometry.shader_test +++ b/tests/trigonometry.shader_test @@ -29,3 +29,31 @@ probe (12, 0) rgba (-0.53657292, 0.84385396, 0.0, 0.0) 1024 probe (13, 0) rgba ( 0.42016704, 0.90744678, 0.0, 0.0) 1024 probe (14, 0) rgba ( 0.99060736, 0.13673722, 0.0, 0.0) 1024 probe (15, 0) rgba ( 0.65028784, -0.75968791, 0.0, 0.0) 1024 + + +[pixel shader todo] +uniform float4 a; + +float4 main() : sv_target +{ + return round(1000 * sin(a)); +} + +[test] +uniform 0 float4 0.0 0.52359877 2.61799387 3.14159265 +todo draw quad +todo probe all rgba (0.0, 500.0, 500.0, 0.0) + + +[pixel shader todo] +uniform float4 a; + +float4 main() : sv_target +{ + return round(1000 * cos(a)); +} + +[test] +uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 +todo draw quad +todo probe all rgba (1000.0, 707.0, -0.0, -707.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Add field-level documentation to struct hlsl_scope.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 2b1ec0cfe525c12ea05ad95a6be8209746d80abe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2b1ec0cfe525c12ea05ad95a6be82… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Nov 16 15:39:51 2022 -0300 vkd3d-shader/hlsl: Add field-level documentation to struct hlsl_scope. --- libs/vkd3d-shader/hlsl.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 07718316..3317bd6f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -598,9 +598,15 @@ struct hlsl_ir_constant struct hlsl_scope { + /* Item entry for hlsl_ctx.scopes. */ struct list entry; + + /* List containing the variables declared in this scope; linked by hlsl_ir_var->scope_entry. */ struct list vars; + /* Tree map containing the types declared in this scope, using hlsl_tree.name as key. + * The types are attached through the hlsl_type.scope_entry fields. */ struct rb_tree types; + /* Scope containing this scope. This value is NULL for the global scope. */ struct hlsl_scope *upper; };

1 0

Zebediah Figura : vkd3d-shader/hlsl: Remove some unnecessary YYABORTs from the func_prototype_no_attrs rule.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 6c2472ce16f4f45ba6ad5dcf60fbb841962a92cf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6c2472ce16f4f45ba6ad5dcf60fbb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 19:18:52 2022 -0600 vkd3d-shader/hlsl: Remove some unnecessary YYABORTs from the func_prototype_no_attrs rule. --- libs/vkd3d-shader/hlsl.y | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index a377a377..71dfe03f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3967,11 +3967,8 @@ func_prototype_no_attrs: struct hlsl_type *type; if (modifiers & ~HLSL_MODIFIERS_MAJORITY_MASK) - { hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Only majority modifiers are allowed on functions."); - YYABORT; - } if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; if ((var = hlsl_get_var(ctx->globals, $3))) @@ -3980,7 +3977,6 @@ func_prototype_no_attrs: "\"%s\" is already declared as a variable.", $3); hlsl_note(ctx, &var->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", $3); - YYABORT; } if (hlsl_types_are_equal(type, ctx->builtin_types.Void) && $7.semantic.name) {

1 0

Francisco Casas : vkd3d-shader/hlsl: Parse step() intrinsic.
by Alexandre Julliard Jan. 26, 2023

Jan. 26, 2023

Module: vkd3d Branch: master Commit: 13c8e8b856543825a6482e421682beaeb3e83a67 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13c8e8b856543825a6482e421682b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jan 13 16:22:41 2023 -0300 vkd3d-shader/hlsl: Parse step() intrinsic. --- libs/vkd3d-shader/hlsl.y | 23 +++++++++++++++++++++-- tests/step.shader_test | 18 +++++++++--------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 88bfabe4..a377a377 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1486,7 +1486,7 @@ static struct list *add_binary_bitwise_expr_merge(struct hlsl_ctx *ctx, struct l static struct hlsl_ir_node *add_binary_comparison_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2, - struct vkd3d_shader_location *loc) + const struct vkd3d_shader_location *loc) { struct hlsl_type *common_type, *return_type; enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); @@ -1510,7 +1510,7 @@ static struct hlsl_ir_node *add_binary_comparison_expr(struct hlsl_ctx *ctx, str } static struct list *add_binary_comparison_expr_merge(struct hlsl_ctx *ctx, struct list *list1, struct list *list2, - enum hlsl_ir_expr_op op, struct vkd3d_shader_location loc) + enum hlsl_ir_expr_op op, const struct vkd3d_shader_location loc) { struct hlsl_ir_node *arg1 = node_from_list(list1), *arg2 = node_from_list(list2); @@ -2828,6 +2828,24 @@ static bool intrinsic_sqrt(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_SQRT, arg, loc); } +static bool intrinsic_step(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *ge; + struct hlsl_type *type; + + if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) + return false; + + if (!(ge = add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_GEQUAL, + params->args[1], params->args[0], loc))) + return false; + + type = ge->data_type; + type = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + return !!add_implicit_conversion(ctx, params->instrs, ge, type, loc); +} + static bool intrinsic_transpose(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2917,6 +2935,7 @@ intrinsic_functions[] = {"sin", 1, true, intrinsic_sin}, {"smoothstep", 3, true, intrinsic_smoothstep}, {"sqrt", 1, true, intrinsic_sqrt}, + {"step", 2, true, intrinsic_step}, {"transpose", 1, true, intrinsic_transpose}, }; diff --git a/tests/step.shader_test b/tests/step.shader_test index 8a8b1fd2..e201e15f 100644 --- a/tests/step.shader_test +++ b/tests/step.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader] uniform float4 f, p; float4 main() : sv_target @@ -9,11 +9,11 @@ float4 main() : sv_target [test] uniform 0 float4 5.0 -2.6 3.0 2.0 uniform 4 float4 1.0 -4.3 3.0 4.0 -todo draw quad -todo probe all rgba (0.0, 0.0, 1.0, 1.0) +draw quad +probe all rgba (0.0, 0.0, 1.0, 1.0) -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float2x2 a = {1, 2, 3, 4}; @@ -23,8 +23,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (1.0, 1.0, 1.0, 0.0) +draw quad +probe all rgba (1.0, 1.0, 1.0, 0.0) [pixel shader fail] @@ -38,7 +38,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float3x2 a = {8, 0, @@ -51,5 +51,5 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (0.0, 1.0, 1.0, 0.0) +draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0)

1 0