Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
vkd3d
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wine
vkd3d
Commits
96556a88
Commit
96556a88
authored
1 year ago
by
Henri Verbeet
Committed by
Alexandre Julliard
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/hlsl: Add support for RWTexture2DArray.
parent
6fe781ff
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!419
vkd3d-shader/hlsl: Add support for RWTexture1DArray and RWTexture2DArray.
Pipeline
#16868
skipped
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libs/vkd3d-shader/hlsl.l
+1
-0
1 addition, 0 deletions
libs/vkd3d-shader/hlsl.l
libs/vkd3d-shader/hlsl.y
+6
-0
6 additions, 0 deletions
libs/vkd3d-shader/hlsl.y
tests/hlsl/uav-rwtexture.shader_test
+1
-1
1 addition, 1 deletion
tests/hlsl/uav-rwtexture.shader_test
with
8 additions
and
1 deletion
libs/vkd3d-shader/hlsl.l
+
1
−
0
View file @
96556a88
...
...
@@ -111,6 +111,7 @@ RWStructuredBuffer {return KW_RWSTRUCTUREDBUFFER; }
RWTexture1D {return KW_RWTEXTURE1D; }
RWTexture1DArray {return KW_RWTEXTURE1DARRAY; }
RWTexture2D {return KW_RWTEXTURE2D; }
RWTexture2DArray {return KW_RWTEXTURE2DARRAY; }
RWTexture3D {return KW_RWTEXTURE3D; }
sampler {return KW_SAMPLER; }
sampler1D {return KW_SAMPLER1D; }
...
...
This diff is collapsed.
Click to expand it.
libs/vkd3d-shader/hlsl.y
+
6
−
0
View file @
96556a88
...
...
@@ -4724,6 +4724,7 @@ static struct hlsl_scope *get_loop_scope(struct hlsl_scope *scope)
%token KW_RWTEXTURE1D
%token KW_RWTEXTURE1DARRAY
%token KW_RWTEXTURE2D
%token KW_RWTEXTURE2DARRAY
%token KW_RWTEXTURE3D
%token KW_SAMPLER
%token KW_SAMPLER1D
...
...
@@ -5556,6 +5557,10 @@ uav_type:
{
$$ = HLSL_SAMPLER_DIM_2D;
}
| KW_RWTEXTURE2DARRAY
{
$$ = HLSL_SAMPLER_DIM_2DARRAY;
}
| KW_RWTEXTURE3D
{
$$ = HLSL_SAMPLER_DIM_3D;
...
...
@@ -5704,6 +5709,7 @@ type_no_void:
case HLSL_SAMPLER_DIM_1D:
case HLSL_SAMPLER_DIM_1DARRAY:
case HLSL_SAMPLER_DIM_2D:
case HLSL_SAMPLER_DIM_2DARRAY:
case HLSL_SAMPLER_DIM_3D:
if ($3->class == HLSL_CLASS_ARRAY)
{
...
...
This diff is collapsed.
Click to expand it.
tests/hlsl/uav-rwtexture.shader_test
+
1
−
1
View file @
96556a88
...
...
@@ -217,7 +217,7 @@ float4 main() : sv_target1
}
% RWTexture2DArray types
[pixel shader fail(sm>=6)
todo
]
[pixel shader fail(sm>=6)]
struct s
{
float3 a;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment