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: Allow interpolation modifiers on structure fields.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2023-09-21 15:13:27 +02:00 committed by Alexandre Julliard
parent de860c3cbf
commit 1930b51d97
Notes: Alexandre Julliard 2023-10-09 23:10:36 +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/358
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,6 +361,9 @@ struct hlsl_attribute
HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \
HLSL_MODIFIER_COLUMN_MAJOR) HLSL_MODIFIER_COLUMN_MAJOR)
#define HLSL_INTERPOLATION_MODIFIERS_MASK (HLSL_STORAGE_NOINTERPOLATION | HLSL_STORAGE_CENTROID | \
HLSL_STORAGE_NOPERSPECTIVE)
#define HLSL_MODIFIERS_MAJORITY_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) #define HLSL_MODIFIERS_MAJORITY_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR)
#define HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT 0 #define HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT 0

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

@ -5051,7 +5051,7 @@ field:
if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1))) if (!(type = apply_type_modifiers(ctx, $2, &modifiers, true, &@1)))
YYABORT; YYABORT;
if (modifiers & ~HLSL_STORAGE_NOINTERPOLATION) if (modifiers & ~HLSL_INTERPOLATION_MODIFIERS_MASK)
{ {
struct vkd3d_string_buffer *string; struct vkd3d_string_buffer *string;

8
tests/hlsl/nointerpolation.shader_test
View File

@ -119,7 +119,7 @@ void main(uint id : sv_vertexid, inout ps_input input, out float4 pos : sv_posit
pos = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1); pos = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1);
} }
[pixel shader todo] [pixel shader]
struct ps_input struct ps_input
{ {
centroid float4 t : texcoord; centroid float4 t : texcoord;
@ -131,10 +131,10 @@ float4 main(nointerpolation ps_input input) : sv_target
} }
[test] [test]
todo draw triangle list 3 draw triangle list 3
todo probe all rgba (0.0, 1.0, 0.0, 1.0) probe all rgba (0.0, 1.0, 0.0, 1.0)
[vertex shader fail] [vertex shader fail todo]
struct ps_input struct ps_input
{ {
nointerpolation centroid float4 t : texcoord; nointerpolation centroid float4 t : texcoord;