ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Matteo Bruni 2012-09-18 18:18:07 +02:00 committed by Alexandre Julliard
parent 4ccffd8fa9
commit 47e931823c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3dcompiler_43/d3dcompiler_private.h
View File

@ -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;

3
dlls/d3dcompiler_43/utils.c
View File

@ -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;