[PATCH v2 0/1] MR293: vkd3d-shader/hlsl: Force sm1 inputs to be 4-component only for vertex shaders.

[Zebediah Figura (＠zfigura)]

--
  v2: vkd3d-shader/hlsl: Force sm1 inputs to be 4-component only for vertex shaders.

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

[PATCH v2 1/1] vkd3d-shader/hlsl: Force sm1 inputs to be 4-component only for vertex shaders.

[Zebediah Figura]

From: Zebediah Figura

Pixel shaders still have an appropriate writemask.
---
 libs/vkd3d-shader/hlsl_codegen.c | 5 +++--
 tests/vkd3d_shader_api.c         | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 25b5ca2f..d02e608c 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -321,9 +321,10 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct
     if (!semantic->name)
         return;

-    vector_type_src = hlsl_get_vector_type(ctx, type->base_type,
-            (ctx->profile->major_version < 4) ? 4 : hlsl_type_minor_size(type));
     vector_type_dst = hlsl_get_vector_type(ctx, type->base_type, hlsl_type_minor_size(type));
+    vector_type_src = vector_type_dst;
+    if (ctx->profile->major_version < 4 && ctx->profile->type == VKD3D_SHADER_TYPE_VERTEX)
+        vector_type_src = hlsl_get_vector_type(ctx, type->base_type, 4);

for (i = 0; i < hlsl_type_major_size(type); ++i)
     {
diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c
index 8bd728d9..ea190b87 100644
--- a/tests/vkd3d_shader_api.c
+++ b/tests/vkd3d_shader_api.c
@@ -630,7 +630,7 @@ static void test_scan_signatures(void)
     {
         {"COLOR",           0, 0, VKD3D_SHADER_SV_NONE,             VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf},
         {"TEXCOORD",        2, 0, VKD3D_SHADER_SV_NONE,             VKD3D_SHADER_COMPONENT_FLOAT, 1, 0xf, 0xf},
-        {"DEPTH",           0, 0, VKD3D_SHADER_SV_NONE,             VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf},
+        {"DEPTH",           0, 0, VKD3D_SHADER_SV_NONE,             VKD3D_SHADER_COMPONENT_FLOAT, 2, 0x1, 0x1},
         {"BLENDINDICES",    0, 0, VKD3D_SHADER_SV_NONE,             VKD3D_SHADER_COMPONENT_FLOAT, 3, 0xf, 0xf},
         {"VPOS",            0, 0, VKD3D_SHADER_SV_POSITION,         VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf},
         {"VFACE",           0, 0, VKD3D_SHADER_SV_IS_FRONT_FACE,    VKD3D_SHADER_COMPONENT_FLOAT, 1, 0x1, 0x1},

[Zebediah Figura (＠zfigura)]

And this is *also* what I get for forgetting to run the tests. Pushed v2.

[PATCH v2 0/1] MR293: vkd3d-shader/hlsl: Force sm1 inputs to be 4-component only for vertex shaders. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.