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: Parse valid texture array types.

Browse Source 
Signed-off-by: Francisco Casas <fcasas@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francisco Casas
2022-01-27 15:31:26 -03:00
committed by Alexandre Julliard
parent 8b4cd715ea
commit b78087c20f
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,6 +133,7 @@ texture3D {return KW_TEXTURE3D; }
Texture3D {return KW_TEXTURE3D; } Texture3D {return KW_TEXTURE3D; }
textureCUBE {return KW_TEXTURECUBE; } textureCUBE {return KW_TEXTURECUBE; }
TextureCube {return KW_TEXTURECUBE; } TextureCube {return KW_TEXTURECUBE; }
TextureCubeArray {return KW_TEXTURECUBEARRAY; }
true {return KW_TRUE; } true {return KW_TRUE; }
typedef {return KW_TYPEDEF; } typedef {return KW_TYPEDEF; }
uniform {return KW_UNIFORM; } uniform {return KW_UNIFORM; }

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

@@ -2172,6 +2172,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
%token KW_TEXTURE2DMSARRAY %token KW_TEXTURE2DMSARRAY
%token KW_TEXTURE3D %token KW_TEXTURE3D
%token KW_TEXTURECUBE %token KW_TEXTURECUBE
%token KW_TEXTURECUBEARRAY
%token KW_TRUE %token KW_TRUE
%token KW_TYPEDEF %token KW_TYPEDEF
%token KW_UNIFORM %token KW_UNIFORM
@@ -2716,6 +2717,18 @@ texture_type:
{ {
$$ = HLSL_SAMPLER_DIM_CUBE; $$ = HLSL_SAMPLER_DIM_CUBE;
} }
| KW_TEXTURE1DARRAY
{
$$ = HLSL_SAMPLER_DIM_1DARRAY;
}
| KW_TEXTURE2DARRAY
{
$$ = HLSL_SAMPLER_DIM_2DARRAY;
}
| KW_TEXTURECUBEARRAY
{
$$ = HLSL_SAMPLER_DIM_CUBEARRAY;
}
type: type:
KW_VECTOR '<' type ',' C_INTEGER '>' KW_VECTOR '<' type ',' C_INTEGER '>'