wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Process GeometryShader as a valid stateblock lhs.

Browse Source
This commit is contained in:
Francisco Casas 2024-06-21 15:59:23 -04:00 committed by Henri Verbeet
parent 3423d1b54b
commit 1f9fc2a422
Notes: Henri Verbeet 2024-09-14 16:53:12 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1057
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d-shader/fx.c
View File

@ -570,6 +570,9 @@ static const char * get_fx_4_type_name(const struct hlsl_type *type)
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
return "VertexShader"; return "VertexShader";
case HLSL_CLASS_GEOMETRY_SHADER:
return "GeometryShader";
case HLSL_CLASS_PIXEL_SHADER: case HLSL_CLASS_PIXEL_SHADER:
return "PixelShader"; return "PixelShader";

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

@ -969,6 +969,7 @@ static const char * get_case_insensitive_typename(const char *name)
{ {
"dword", "dword",
"float", "float",
"geometryshader",
"matrix", "matrix",
"pixelshader", "pixelshader",
"texture", "texture",

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

@ -7797,6 +7797,11 @@ stateblock_lhs_identifier:
if (!($$ = hlsl_strdup(ctx, "vertexshader"))) if (!($$ = hlsl_strdup(ctx, "vertexshader")))
YYABORT; YYABORT;
} }
| KW_GEOMETRYSHADER
{
if (!($$ = hlsl_strdup(ctx, "geometryshader")))
YYABORT;
}
state_block_index_opt: state_block_index_opt:
%empty %empty