wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Add support for RWTexture2DArray.

Browse Source
This commit is contained in:
Henri Verbeet 2023-10-18 22:56:52 +02:00 committed by Alexandre Julliard
parent 6fe781ff50
commit 96556a8834
Notes: Alexandre Julliard 2023-10-19 23:22:47 +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/419
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,6 +111,7 @@ RWStructuredBuffer {return KW_RWSTRUCTUREDBUFFER; }
RWTexture1D {return KW_RWTEXTURE1D; } RWTexture1D {return KW_RWTEXTURE1D; }
RWTexture1DArray {return KW_RWTEXTURE1DARRAY; } RWTexture1DArray {return KW_RWTEXTURE1DARRAY; }
RWTexture2D {return KW_RWTEXTURE2D; } RWTexture2D {return KW_RWTEXTURE2D; }
RWTexture2DArray {return KW_RWTEXTURE2DARRAY; }
RWTexture3D {return KW_RWTEXTURE3D; } RWTexture3D {return KW_RWTEXTURE3D; }
sampler {return KW_SAMPLER; } sampler {return KW_SAMPLER; }
sampler1D {return KW_SAMPLER1D; } sampler1D {return KW_SAMPLER1D; }

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

@ -4724,6 +4724,7 @@ static struct hlsl_scope *get_loop_scope(struct hlsl_scope *scope)
%token KW_RWTEXTURE1D %token KW_RWTEXTURE1D
%token KW_RWTEXTURE1DARRAY %token KW_RWTEXTURE1DARRAY
%token KW_RWTEXTURE2D %token KW_RWTEXTURE2D
%token KW_RWTEXTURE2DARRAY
%token KW_RWTEXTURE3D %token KW_RWTEXTURE3D
%token KW_SAMPLER %token KW_SAMPLER
%token KW_SAMPLER1D %token KW_SAMPLER1D
@ -5556,6 +5557,10 @@ uav_type:
{ {
$$ = HLSL_SAMPLER_DIM_2D; $$ = HLSL_SAMPLER_DIM_2D;
} }
| KW_RWTEXTURE2DARRAY
{
$$ = HLSL_SAMPLER_DIM_2DARRAY;
}
| KW_RWTEXTURE3D | KW_RWTEXTURE3D
{ {
$$ = HLSL_SAMPLER_DIM_3D; $$ = HLSL_SAMPLER_DIM_3D;
@ -5704,6 +5709,7 @@ type_no_void:
case HLSL_SAMPLER_DIM_1D: case HLSL_SAMPLER_DIM_1D:
case HLSL_SAMPLER_DIM_1DARRAY: case HLSL_SAMPLER_DIM_1DARRAY:
case HLSL_SAMPLER_DIM_2D: case HLSL_SAMPLER_DIM_2D:
case HLSL_SAMPLER_DIM_2DARRAY:
case HLSL_SAMPLER_DIM_3D: case HLSL_SAMPLER_DIM_3D:
if ($3->class == HLSL_CLASS_ARRAY) if ($3->class == HLSL_CLASS_ARRAY)
{ {

2
tests/hlsl/uav-rwtexture.shader_test
View File

@ -217,7 +217,7 @@ float4 main() : sv_target1
} }
% RWTexture2DArray types % RWTexture2DArray types
[pixel shader fail(sm>=6) todo] [pixel shader fail(sm>=6)]
struct s struct s
{ {
float3 a; float3 a;