Giovanni Mascellani : vkd3d-shader/hlsl: Do not handle vector types in major_size() and minor_size().

Alexandre Julliard julliard at winehq.org
Mon Apr 25 16:08:49 CDT 2022


Module: vkd3d
Branch: master
Commit: 74273ccaddf4699bd978ed3152b0166073650528
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=74273ccaddf4699bd978ed3152b0166073650528

Author: Giovanni Mascellani <gmascellani at codeweavers.com>
Date:   Fri Apr 22 12:25:03 2022 +0200

vkd3d-shader/hlsl: Do not handle vector types in major_size() and minor_size().

Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/hlsl_codegen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index f22841fb..f31bfe9f 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -676,7 +676,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr
 
 static unsigned int minor_size(const struct hlsl_type *type)
 {
-    if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR)
+    if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)
         return type->dimx;
     else
         return type->dimy;
@@ -684,7 +684,7 @@ static unsigned int minor_size(const struct hlsl_type *type)
 
 static unsigned int major_size(const struct hlsl_type *type)
 {
-    if (type->type == HLSL_CLASS_VECTOR || type->modifiers & HLSL_MODIFIER_ROW_MAJOR)
+    if (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)
         return type->dimy;
     else
         return type->dimx;




More information about the wine-cvs mailing list