[PATCH 0/1] MR324: vkd3d-shader/hlsl: Add tex1D() function.

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/324

[PATCH 1/1] vkd3d-shader/hlsl: Add tex1D() function.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 libs/vkd3d-shader/hlsl.y       | 7 +++++++
 tests/hlsl/sampler.shader_test | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 161d1ab4..cb4b63a8 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -3466,6 +3466,12 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer *
     return true;
 }
 
+static bool intrinsic_tex1D(struct hlsl_ctx *ctx,
+        const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
+{
+    return intrinsic_tex(ctx, params, loc, "tex1D", HLSL_SAMPLER_DIM_1D);
+}
+
 static bool intrinsic_tex2D(struct hlsl_ctx *ctx,
         const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
 {
@@ -3652,6 +3658,7 @@ intrinsic_functions[] =
     {"smoothstep",                          3, true,  intrinsic_smoothstep},
     {"sqrt",                                1, true,  intrinsic_sqrt},
     {"step",                                2, true,  intrinsic_step},
+    {"tex1D",                              -1, false, intrinsic_tex1D},
     {"tex2D",                              -1, false, intrinsic_tex2D},
     {"tex3D",                              -1, false, intrinsic_tex3D},
     {"texCUBE",                            -1, false, intrinsic_texCUBE},
diff --git a/tests/hlsl/sampler.shader_test b/tests/hlsl/sampler.shader_test
index 8b1c550c..c4b38b32 100644
--- a/tests/hlsl/sampler.shader_test
+++ b/tests/hlsl/sampler.shader_test
@@ -60,3 +60,11 @@ float4 main() : sv_target
 {
     return texCUBE(s, float3(0.0, 0.0, 0.0));
 }
+
+[pixel shader]
+sampler1D s;
+
+float4 main() : sv_target
+{
+    return tex1D(s, 0.0);
+}
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/324

[PATCH 0/1] MR324: vkd3d-shader/hlsl: Add tex1D() function. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/324

[PATCH 0/1] MR324: vkd3d-shader/hlsl: Add tex1D() function. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/324

[PATCH 0/1] MR324: vkd3d-shader/hlsl: Add tex1D() function. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/324