wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Make HLSL_TYPE_EFFECT_GROUP into a separate class.

Browse Source
This commit is contained in:
Zebediah Figura
2024-02-05 20:35:22 -06:00
committed by Alexandre Julliard
parent 6b841486d4
commit 24d3a352a6
Notes: Alexandre Julliard 2024-04-23 22:58:08 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/811
6 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/vkd3d-shader/fx.c
View File

@@ -437,6 +437,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
break;
case HLSL_CLASS_ARRAY:
case HLSL_CLASS_EFFECT_GROUP:
vkd3d_unreachable();
case HLSL_CLASS_SAMPLER:
@@ -618,7 +619,7 @@ static void write_groups(struct fx_write_context *fx)
{
const struct hlsl_type *type = var->data_type;
if (type->base_type == HLSL_TYPE_EFFECT_GROUP)
if (type->class == HLSL_CLASS_EFFECT_GROUP)
write_group(var, fx);
}
}
@@ -834,6 +835,10 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type
case HLSL_CLASS_UAV:
case HLSL_CLASS_VOID:
return false;
case HLSL_CLASS_EFFECT_GROUP:
/* This cannot appear as an extern variable. */
break;
}
vkd3d_unreachable();