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 passes variables to the techniques.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2023-11-11 01:06:45 +01:00 committed by Alexandre Julliard
parent fe8881747b
commit e72f8f9a30
Notes: Alexandre Julliard 2024-01-23 23:03:22 +01:00 
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/565
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3366,6 +3366,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
{"vector", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"vector", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1},
{"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4},
{"fxgroup", HLSL_CLASS_OBJECT, HLSL_TYPE_EFFECT_GROUP, 1, 1}, {"fxgroup", HLSL_CLASS_OBJECT, HLSL_TYPE_EFFECT_GROUP, 1, 1},
{"pass", HLSL_CLASS_OBJECT, HLSL_TYPE_PASS, 1, 1},
{"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1},
{"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1},
{"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, {"PIXELSHADER", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1},

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

@ -95,6 +95,7 @@ enum hlsl_base_type
HLSL_TYPE_UAV, HLSL_TYPE_UAV,
HLSL_TYPE_PIXELSHADER, HLSL_TYPE_PIXELSHADER,
HLSL_TYPE_VERTEXSHADER, HLSL_TYPE_VERTEXSHADER,
HLSL_TYPE_PASS,
HLSL_TYPE_TECHNIQUE, HLSL_TYPE_TECHNIQUE,
HLSL_TYPE_EFFECT_GROUP, HLSL_TYPE_EFFECT_GROUP,
HLSL_TYPE_STRING, HLSL_TYPE_STRING,

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

@ -1096,6 +1096,29 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters
return true; return true;
} }
static bool add_pass(struct hlsl_ctx *ctx, const char *name, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_var *var;
struct hlsl_type *type;
type = hlsl_get_type(ctx->globals, "pass", false, false);
if (!(var = hlsl_new_var(ctx, name, type, loc, NULL, 0, NULL)))
return false;
if (!hlsl_add_var(ctx, var, false))
{
struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, var->name);
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED,
"Identifier \"%s\" was already declared in this scope.", var->name);
hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name);
hlsl_free_var(var);
return false;
}
return true;
}
static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope, static bool add_technique(struct hlsl_ctx *ctx, const char *name, struct hlsl_scope *scope,
const char *typename, const struct vkd3d_shader_location *loc) const char *typename, const struct vkd3d_shader_location *loc)
{ {
@ -5245,6 +5268,10 @@ name_opt:
pass: pass:
KW_PASS name_opt '{' '}' KW_PASS name_opt '{' '}'
{
if (!add_pass(ctx, $2, &@1))
YYABORT;
}
annotations_list: annotations_list:
variables_def_typed ';' variables_def_typed ';'