Commit 47e93182 authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard

d3dcompiler: Only a few modifiers are relevant in type comparison.

parent 4ccffd8f
...@@ -732,6 +732,8 @@ struct hlsl_ir_node ...@@ -732,6 +732,8 @@ struct hlsl_ir_node
#define HLSL_MODIFIER_IN 0x00000800 #define HLSL_MODIFIER_IN 0x00000800
#define HLSL_MODIFIER_OUT 0x00001000 #define HLSL_MODIFIER_OUT 0x00001000
#define HLSL_MODIFIERS_COMPARISON_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)
struct hlsl_ir_var struct hlsl_ir_var
{ {
struct hlsl_ir_node node; struct hlsl_ir_node node;
......
...@@ -921,7 +921,8 @@ static BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_typ ...@@ -921,7 +921,8 @@ static BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_typ
return FALSE; return FALSE;
if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim)
return FALSE; return FALSE;
if (t1->modifiers != t2->modifiers) if ((t1->modifiers & HLSL_MODIFIERS_COMPARISON_MASK)
!= (t2->modifiers & HLSL_MODIFIERS_COMPARISON_MASK))
return FALSE; return FALSE;
if (t1->dimx != t2->dimx) if (t1->dimx != t2->dimx)
return FALSE; return FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment