[PATCH 0/1] MR476: vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins.

[PATCH 1/1] vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins.

[Nikolay Sivov]

From: Nikolay Sivov

---
 libs/vkd3d-shader/hlsl.y | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 5e0d48d3c..869277f0a 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -3155,6 +3155,7 @@ static bool intrinsic_log(struct hlsl_ctx *ctx,
     /* ln(2) */
     if (!(coeff = hlsl_new_float_constant(ctx, 0.69314718055f, loc)))
         return false;
+    hlsl_block_add_instr(params->instrs, coeff);

return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, coeff, loc);
 }
@@ -3173,6 +3174,7 @@ static bool intrinsic_log10(struct hlsl_ctx *ctx,
     /* 1 / log2(10) */
     if (!(coeff = hlsl_new_float_constant(ctx, 0.301029996f, loc)))
         return false;
+    hlsl_block_add_instr(params->instrs, coeff);

return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, coeff, loc);
 }

[PATCH 0/1] MR476: vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins. - approved

[Francisco Casas (＠fcasas)]

This merge request was approved by Francisco Casas.

[PATCH 0/1] MR476: vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/1] MR476: vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[Zebediah Figura (＠zfigura)]

For reference, we do want this for 1.10. This fixes a memory error introduced by a1bd4e080ef5bd0b1bfb073558fb715e9ad54058 and 210caa931db664e2c9fdcff217581fd4bf421e9c.

[PATCH 0/1] MR476: vkd3d-shader/hlsl: Add constants to the block for log()/log10() builtins. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.