wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Parse SamplerComparisonState objects.

Browse Source
This commit is contained in:
Nikolay Sivov 2023-05-16 20:40:10 +02:00 committed by Alexandre Julliard
parent efe107d231
commit 7c94705c54
Notes: Alexandre Julliard 2023-05-29 22:32:35 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/206
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/vkd3d-shader/hlsl.c
View File

@ -3061,11 +3061,12 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
static const char *const sampler_names[] = static const char *const sampler_names[] =
{ {
[HLSL_SAMPLER_DIM_GENERIC] = "sampler", [HLSL_SAMPLER_DIM_GENERIC] = "sampler",
[HLSL_SAMPLER_DIM_1D] = "sampler1D", [HLSL_SAMPLER_DIM_COMPARISON] = "SamplerComparisonState",
[HLSL_SAMPLER_DIM_2D] = "sampler2D", [HLSL_SAMPLER_DIM_1D] = "sampler1D",
[HLSL_SAMPLER_DIM_3D] = "sampler3D", [HLSL_SAMPLER_DIM_2D] = "sampler2D",
[HLSL_SAMPLER_DIM_CUBE] = "samplerCUBE", [HLSL_SAMPLER_DIM_3D] = "sampler3D",
[HLSL_SAMPLER_DIM_CUBE] = "samplerCUBE",
}; };
static const struct static const struct

1
libs/vkd3d-shader/hlsl.h
View File

@ -105,6 +105,7 @@ enum hlsl_base_type
enum hlsl_sampler_dim enum hlsl_sampler_dim
{ {
HLSL_SAMPLER_DIM_GENERIC, HLSL_SAMPLER_DIM_GENERIC,
HLSL_SAMPLER_DIM_COMPARISON,
HLSL_SAMPLER_DIM_1D, HLSL_SAMPLER_DIM_1D,
HLSL_SAMPLER_DIM_2D, HLSL_SAMPLER_DIM_2D,
HLSL_SAMPLER_DIM_3D, HLSL_SAMPLER_DIM_3D,

4
libs/vkd3d-shader/hlsl.y
View File

@ -5148,6 +5148,10 @@ type_no_void:
{ {
$$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_GENERIC]; $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_GENERIC];
} }
| KW_SAMPLERCOMPARISONSTATE
{
$$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_COMPARISON];
}
| KW_SAMPLER1D | KW_SAMPLER1D
{ {
$$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_1D]; $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_1D];