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: Make the HLSL compiler reëntrant.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-02-04 16:33:53 -06:00 committed by Alexandre Julliard
parent f1acb3d383
commit c7d4acaf4b
4 changed files with 362 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,19 +25,20 @@ void hlsl_message(const char *fmt, ...)
/* FIXME */ /* FIXME */
} }
void hlsl_report_message(const struct source_location loc, void hlsl_report_message(struct hlsl_ctx *ctx, const struct source_location loc,
enum hlsl_error_level level, const char *fmt, ...) enum hlsl_error_level level, const char *fmt, ...)
{ {
/* FIXME */ /* FIXME */
if (level == HLSL_LEVEL_ERROR) if (level == HLSL_LEVEL_ERROR)
set_parse_status(&hlsl_ctx.status, PARSE_ERR); set_parse_status(&ctx->status, PARSE_ERR);
else if (level == HLSL_LEVEL_WARNING) else if (level == HLSL_LEVEL_WARNING)
set_parse_status(&hlsl_ctx.status, PARSE_WARN); set_parse_status(&ctx->status, PARSE_WARN);
} }
bool hlsl_add_var(struct hlsl_scope *scope, struct hlsl_ir_var *decl, bool local_var) bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var)
{ {
struct hlsl_scope *scope = ctx->cur_scope;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry)
@ -45,7 +46,7 @@ bool hlsl_add_var(struct hlsl_scope *scope, struct hlsl_ir_var *decl, bool local
if (!strcmp(decl->name, var->name)) if (!strcmp(decl->name, var->name))
return false; return false;
} }
if (local_var && scope->upper->upper == hlsl_ctx.globals) if (local_var && scope->upper->upper == ctx->globals)
{ {
/* Check whether the variable redefines a function parameter. */ /* Check whether the variable redefines a function parameter. */
LIST_FOR_EACH_ENTRY(var, &scope->upper->vars, struct hlsl_ir_var, scope_entry) LIST_FOR_EACH_ENTRY(var, &scope->upper->vars, struct hlsl_ir_var, scope_entry)
@ -81,7 +82,7 @@ void hlsl_free_var(struct hlsl_ir_var *decl)
vkd3d_free(decl); vkd3d_free(decl);
} }
struct hlsl_type *hlsl_new_type(const char *name, enum hlsl_type_class type_class, struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class,
enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) enum hlsl_base_type base_type, unsigned dimx, unsigned dimy)
{ {
struct hlsl_type *type; struct hlsl_type *type;
@ -98,14 +99,14 @@ struct hlsl_type *hlsl_new_type(const char *name, enum hlsl_type_class type_clas
else else
type->reg_size = 1; type->reg_size = 1;
list_add_tail(&hlsl_ctx.types, &type->entry); list_add_tail(&ctx->types, &type->entry);
return type; return type;
} }
struct hlsl_type *hlsl_new_array_type(struct hlsl_type *basic_type, unsigned int array_size) struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size)
{ {
struct hlsl_type *type = hlsl_new_type(NULL, HLSL_CLASS_ARRAY, HLSL_TYPE_FLOAT, 1, 1); struct hlsl_type *type = hlsl_new_type(ctx, NULL, HLSL_CLASS_ARRAY, HLSL_TYPE_FLOAT, 1, 1);
if (!type) if (!type)
return NULL; return NULL;
@ -126,7 +127,7 @@ static DWORD get_array_size(const struct hlsl_type *type)
return 1; return 1;
} }
struct hlsl_type *hlsl_new_struct_type(const char *name, struct list *fields) struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields)
{ {
struct hlsl_struct_field *field; struct hlsl_struct_field *field;
unsigned int reg_size = 0; unsigned int reg_size = 0;
@ -149,7 +150,7 @@ struct hlsl_type *hlsl_new_struct_type(const char *name, struct list *fields)
} }
type->reg_size = reg_size; type->reg_size = reg_size;
list_add_tail(&hlsl_ctx.types, &type->entry); list_add_tail(&ctx->types, &type->entry);
return type; return type;
} }
@ -166,9 +167,9 @@ struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool
return NULL; return NULL;
} }
bool hlsl_get_function(const char *name) bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name)
{ {
return rb_get(&hlsl_ctx.functions, name) != NULL; return rb_get(&ctx->functions, name) != NULL;
} }
unsigned int hlsl_type_component_count(struct hlsl_type *type) unsigned int hlsl_type_component_count(struct hlsl_type *type)
@ -243,7 +244,7 @@ bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2)
return true; return true;
} }
struct hlsl_type *hlsl_type_clone(struct hlsl_type *old, unsigned int default_majority) struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority)
{ {
struct hlsl_struct_field *old_field, *field; struct hlsl_struct_field *old_field, *field;
struct hlsl_type *type; struct hlsl_type *type;
@ -271,7 +272,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_type *old, unsigned int default_ma
switch (old->type) switch (old->type)
{ {
case HLSL_CLASS_ARRAY: case HLSL_CLASS_ARRAY:
type->e.array.type = hlsl_type_clone(old->e.array.type, default_majority); type->e.array.type = hlsl_type_clone(ctx, old->e.array.type, default_majority);
type->e.array.elements_count = old->e.array.elements_count; type->e.array.elements_count = old->e.array.elements_count;
type->reg_size = type->e.array.elements_count * type->e.array.type->reg_size; type->reg_size = type->e.array.elements_count * type->e.array.type->reg_size;
break; break;
@ -302,7 +303,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_type *old, unsigned int default_ma
vkd3d_free(type); vkd3d_free(type);
return NULL; return NULL;
} }
field->type = hlsl_type_clone(old_field->type, default_majority); field->type = hlsl_type_clone(ctx, old_field->type, default_majority);
field->name = vkd3d_strdup(old_field->name); field->name = vkd3d_strdup(old_field->name);
if (old_field->semantic) if (old_field->semantic)
field->semantic = vkd3d_strdup(old_field->semantic); field->semantic = vkd3d_strdup(old_field->semantic);
@ -324,7 +325,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_type *old, unsigned int default_ma
break; break;
} }
list_add_tail(&hlsl_ctx.types, &type->entry); list_add_tail(&ctx->types, &type->entry);
return type; return type;
} }
@ -354,10 +355,7 @@ struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
if (!(var = vkd3d_calloc(1, sizeof(*var)))) if (!(var = vkd3d_calloc(1, sizeof(*var))))
{
hlsl_ctx.status = PARSE_ERR;
return NULL; return NULL;
}
var->name = name; var->name = name;
var->data_type = type; var->data_type = type;
@ -368,12 +366,13 @@ struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const
return var; return var;
} }
struct hlsl_ir_var *hlsl_new_synthetic_var(const char *name, struct hlsl_type *type, const struct source_location loc) struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type,
const struct source_location loc)
{ {
struct hlsl_ir_var *var = hlsl_new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL); struct hlsl_ir_var *var = hlsl_new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL);
if (var) if (var)
list_add_tail(&hlsl_ctx.globals->vars, &var->scope_entry); list_add_tail(&ctx->globals->vars, &var->scope_entry);
return var; return var;
} }
@ -406,13 +405,13 @@ struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, s
return hlsl_new_assignment(lhs, NULL, rhs, 0, rhs->loc); return hlsl_new_assignment(lhs, NULL, rhs, 0, rhs->loc);
} }
struct hlsl_ir_constant *hlsl_new_uint_constant(unsigned int n, const struct source_location loc) struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct source_location loc)
{ {
struct hlsl_ir_constant *c; struct hlsl_ir_constant *c;
if (!(c = vkd3d_malloc(sizeof(*c)))) if (!(c = vkd3d_malloc(sizeof(*c))))
return NULL; return NULL;
init_node(&c->node, HLSL_IR_CONSTANT, hlsl_ctx.builtin_types.scalar[HLSL_TYPE_UINT], loc); init_node(&c->node, HLSL_IR_CONSTANT, ctx->builtin_types.scalar[HLSL_TYPE_UINT], loc);
c->value.u[0] = n; c->value.u[0] = n;
return c; return c;
} }
@ -468,7 +467,7 @@ struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct sou
return load; return load;
} }
struct hlsl_ir_swizzle *hlsl_new_swizzle(DWORD s, unsigned int components, struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components,
struct hlsl_ir_node *val, struct source_location *loc) struct hlsl_ir_node *val, struct source_location *loc)
{ {
struct hlsl_ir_swizzle *swizzle; struct hlsl_ir_swizzle *swizzle;
@ -476,7 +475,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(DWORD s, unsigned int components,
if (!(swizzle = vkd3d_malloc(sizeof(*swizzle)))) if (!(swizzle = vkd3d_malloc(sizeof(*swizzle))))
return NULL; return NULL;
init_node(&swizzle->node, HLSL_IR_SWIZZLE, init_node(&swizzle->node, HLSL_IR_SWIZZLE,
hlsl_new_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc); hlsl_new_type(ctx, NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1), *loc);
hlsl_src_from_node(&swizzle->val, val); hlsl_src_from_node(&swizzle->val, val);
swizzle->swizzle = s; swizzle->swizzle = s;
return swizzle; return swizzle;
@ -487,7 +486,7 @@ bool hlsl_type_is_void(const struct hlsl_type *type)
return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID;
} }
struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_type *return_type, struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type,
struct list *parameters, const char *semantic, struct source_location loc) struct list *parameters, const char *semantic, struct source_location loc)
{ {
struct hlsl_ir_function_decl *decl; struct hlsl_ir_function_decl *decl;
@ -505,7 +504,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_type *return_type,
char name[28]; char name[28];
sprintf(name, "<retval-%p>", decl); sprintf(name, "<retval-%p>", decl);
if (!(return_var = hlsl_new_synthetic_var(name, return_type, loc))) if (!(return_var = hlsl_new_synthetic_var(ctx, name, return_type, loc)))
{ {
vkd3d_free(decl); vkd3d_free(decl);
return NULL; return NULL;
@ -532,7 +531,7 @@ static int compare_hlsl_types_rb(const void *key, const struct rb_entry *entry)
return strcmp(name, type->name); return strcmp(name, type->name);
} }
void hlsl_push_scope(struct hlsl_parse_ctx *ctx) void hlsl_push_scope(struct hlsl_ctx *ctx)
{ {
struct hlsl_scope *new_scope; struct hlsl_scope *new_scope;
@ -546,7 +545,7 @@ void hlsl_push_scope(struct hlsl_parse_ctx *ctx)
list_add_tail(&ctx->scopes, &new_scope->entry); list_add_tail(&ctx->scopes, &new_scope->entry);
} }
void hlsl_pop_scope(struct hlsl_parse_ctx *ctx) void hlsl_pop_scope(struct hlsl_ctx *ctx)
{ {
struct hlsl_scope *prev_scope = ctx->cur_scope->upper; struct hlsl_scope *prev_scope = ctx->cur_scope->upper;
@ -1376,7 +1375,7 @@ static int compare_function_rb(const void *key, const struct rb_entry *entry)
return strcmp(name, func->name); return strcmp(name, func->name);
} }
static void declare_predefined_types(struct hlsl_scope *scope) static void declare_predefined_types(struct hlsl_ctx *ctx)
{ {
unsigned int x, y, bt, i; unsigned int x, y, bt, i;
struct hlsl_type *type; struct hlsl_type *type;
@ -1427,22 +1426,22 @@ static void declare_predefined_types(struct hlsl_scope *scope)
for (x = 1; x <= 4; ++x) for (x = 1; x <= 4; ++x)
{ {
sprintf(name, "%s%ux%u", names[bt], y, x); sprintf(name, "%s%ux%u", names[bt], y, x);
type = hlsl_new_type(vkd3d_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); type = hlsl_new_type(ctx, vkd3d_strdup(name), HLSL_CLASS_MATRIX, bt, x, y);
hlsl_scope_add_type(scope, type); hlsl_scope_add_type(ctx->globals, type);
if (y == 1) if (y == 1)
{ {
sprintf(name, "%s%u", names[bt], x); sprintf(name, "%s%u", names[bt], x);
type = hlsl_new_type(vkd3d_strdup(name), HLSL_CLASS_VECTOR, bt, x, y); type = hlsl_new_type(ctx, vkd3d_strdup(name), HLSL_CLASS_VECTOR, bt, x, y);
hlsl_scope_add_type(scope, type); hlsl_scope_add_type(ctx->globals, type);
hlsl_ctx.builtin_types.vector[bt][x - 1] = type; ctx->builtin_types.vector[bt][x - 1] = type;
if (x == 1) if (x == 1)
{ {
sprintf(name, "%s", names[bt]); sprintf(name, "%s", names[bt]);
type = hlsl_new_type(vkd3d_strdup(name), HLSL_CLASS_SCALAR, bt, x, y); type = hlsl_new_type(ctx, vkd3d_strdup(name), HLSL_CLASS_SCALAR, bt, x, y);
hlsl_scope_add_type(scope, type); hlsl_scope_add_type(ctx->globals, type);
hlsl_ctx.builtin_types.scalar[bt] = type; ctx->builtin_types.scalar[bt] = type;
} }
} }
} }
@ -1451,22 +1450,22 @@ static void declare_predefined_types(struct hlsl_scope *scope)
for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt)
{ {
type = hlsl_new_type(vkd3d_strdup(sampler_names[bt]), HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); type = hlsl_new_type(ctx, vkd3d_strdup(sampler_names[bt]), HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1);
type->sampler_dim = bt; type->sampler_dim = bt;
hlsl_ctx.builtin_types.sampler[bt] = type; ctx->builtin_types.sampler[bt] = type;
} }
hlsl_ctx.builtin_types.Void = hlsl_new_type(vkd3d_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); ctx->builtin_types.Void = hlsl_new_type(ctx, vkd3d_strdup("void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1);
for (i = 0; i < ARRAY_SIZE(effect_types); ++i) for (i = 0; i < ARRAY_SIZE(effect_types); ++i)
{ {
type = hlsl_new_type(vkd3d_strdup(effect_types[i].name), effect_types[i].class, type = hlsl_new_type(ctx, vkd3d_strdup(effect_types[i].name), effect_types[i].class,
effect_types[i].base_type, effect_types[i].dimx, effect_types[i].dimy); effect_types[i].base_type, effect_types[i].dimx, effect_types[i].dimy);
hlsl_scope_add_type(scope, type); hlsl_scope_add_type(ctx->globals, type);
} }
} }
static bool hlsl_ctx_init(struct hlsl_parse_ctx *ctx, struct vkd3d_shader_message_context *message_context) static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_context *message_context)
{ {
memset(ctx, 0, sizeof(*ctx)); memset(ctx, 0, sizeof(*ctx));
@ -1490,7 +1489,7 @@ static bool hlsl_ctx_init(struct hlsl_parse_ctx *ctx, struct vkd3d_shader_messag
ctx->globals = ctx->cur_scope; ctx->globals = ctx->cur_scope;
list_init(&ctx->types); list_init(&ctx->types);
declare_predefined_types(ctx->globals); declare_predefined_types(ctx);
rb_init(&ctx->functions, compare_function_rb); rb_init(&ctx->functions, compare_function_rb);
@ -1499,7 +1498,7 @@ static bool hlsl_ctx_init(struct hlsl_parse_ctx *ctx, struct vkd3d_shader_messag
return true; return true;
} }
static void hlsl_ctx_cleanup(struct hlsl_parse_ctx *ctx) static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx)
{ {
struct hlsl_scope *scope, *next_scope; struct hlsl_scope *scope, *next_scope;
struct hlsl_ir_var *var, *next_var; struct hlsl_ir_var *var, *next_var;
@ -1529,6 +1528,7 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info
{ {
const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; const struct vkd3d_shader_hlsl_source_info *hlsl_source_info;
const struct hlsl_profile_info *profile; const struct hlsl_profile_info *profile;
struct hlsl_ctx ctx;
int ret; int ret;
if (!(hlsl_source_info = vkd3d_find_struct(compile_info->next, HLSL_SOURCE_INFO))) if (!(hlsl_source_info = vkd3d_find_struct(compile_info->next, HLSL_SOURCE_INFO)))
@ -1545,12 +1545,12 @@ int hlsl_compile_shader(const char *text, const struct vkd3d_shader_compile_info
vkd3d_shader_dump_shader(profile->type, &compile_info->source); vkd3d_shader_dump_shader(profile->type, &compile_info->source);
if (!hlsl_ctx_init(&hlsl_ctx, message_context)) if (!hlsl_ctx_init(&ctx, message_context))
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
ret = hlsl_lexer_compile(text, hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main"); ret = hlsl_lexer_compile(&ctx, text, hlsl_source_info->entry_point ? hlsl_source_info->entry_point : "main");
hlsl_ctx_cleanup(&hlsl_ctx); hlsl_ctx_cleanup(&ctx);
return ret; return ret;
} }

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

@ -398,7 +398,7 @@ struct hlsl_scope
struct hlsl_scope *upper; struct hlsl_scope *upper;
}; };
struct hlsl_parse_ctx struct hlsl_ctx
{ {
const char **source_files; const char **source_files;
unsigned int source_files_count; unsigned int source_files_count;
@ -408,6 +408,8 @@ struct hlsl_parse_ctx
enum parse_status status; enum parse_status status;
struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_message_context *message_context;
void *scanner;
struct hlsl_scope *cur_scope; struct hlsl_scope *cur_scope;
struct hlsl_scope *globals; struct hlsl_scope *globals;
struct list scopes; struct list scopes;
@ -429,8 +431,6 @@ struct hlsl_parse_ctx
struct list static_initializers; struct list static_initializers;
}; };
extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN;
enum hlsl_error_level enum hlsl_error_level
{ {
HLSL_LEVEL_ERROR = 0, HLSL_LEVEL_ERROR = 0,
@ -525,10 +525,7 @@ const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDE
void hlsl_add_function(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl, void hlsl_add_function(struct rb_tree *funcs, char *name, struct hlsl_ir_function_decl *decl,
bool intrinsic) DECLSPEC_HIDDEN; bool intrinsic) DECLSPEC_HIDDEN;
bool hlsl_add_var(struct hlsl_scope *scope, struct hlsl_ir_var *decl, bool local_var) DECLSPEC_HIDDEN; bool hlsl_add_var(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local_var) DECLSPEC_HIDDEN;
int hlsl_compile(enum vkd3d_shader_type type, DWORD major, DWORD minor, const char *entrypoint,
struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context) DECLSPEC_HIDDEN;
void hlsl_dump_function(const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN; void hlsl_dump_function(const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN;
@ -537,30 +534,32 @@ void hlsl_free_instr_list(struct list *list) DECLSPEC_HIDDEN;
void hlsl_free_type(struct hlsl_type *type) DECLSPEC_HIDDEN; void hlsl_free_type(struct hlsl_type *type) DECLSPEC_HIDDEN;
void hlsl_free_var(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; void hlsl_free_var(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN;
bool hlsl_get_function(const char *name) DECLSPEC_HIDDEN; bool hlsl_get_function(struct hlsl_ctx *ctx, const char *name) DECLSPEC_HIDDEN;
struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) DECLSPEC_HIDDEN;
struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN;
struct hlsl_type *hlsl_new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type,
unsigned int array_size) DECLSPEC_HIDDEN;
struct hlsl_ir_assignment *hlsl_new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset, struct hlsl_ir_assignment *hlsl_new_assignment(struct hlsl_ir_var *var, struct hlsl_ir_node *offset,
struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_node *rhs, unsigned int writemask, struct source_location loc) DECLSPEC_HIDDEN;
struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1,
struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN;
struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type *type,
struct source_location *loc) DECLSPEC_HIDDEN; struct source_location *loc) DECLSPEC_HIDDEN;
struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_type *return_type, struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type,
struct list *parameters, const char *semantic, struct source_location loc) DECLSPEC_HIDDEN; struct list *parameters, const char *semantic, struct source_location loc) DECLSPEC_HIDDEN;
struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct source_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct source_location loc) DECLSPEC_HIDDEN;
struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs,
struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN;
struct hlsl_type *hlsl_new_struct_type(const char *name, struct list *fields) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN;
struct hlsl_ir_swizzle *hlsl_new_swizzle(DWORD s, unsigned int components, struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned int components,
struct hlsl_ir_node *val, struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_node *val, struct source_location *loc) DECLSPEC_HIDDEN;
struct hlsl_ir_var *hlsl_new_synthetic_var(const char *name, struct hlsl_type *type, struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type,
const struct source_location loc) DECLSPEC_HIDDEN; const struct source_location loc) DECLSPEC_HIDDEN;
struct hlsl_type *hlsl_new_type(const char *name, enum hlsl_type_class type_class, struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class,
enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN;
struct hlsl_ir_constant *hlsl_new_uint_constant(unsigned int n, const struct source_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n,
const struct source_location loc) DECLSPEC_HIDDEN;
struct hlsl_ir_node *hlsl_new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct hlsl_ir_node *hlsl_new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg,
struct source_location loc) DECLSPEC_HIDDEN; struct source_location loc) DECLSPEC_HIDDEN;
struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct source_location loc, struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct source_location loc,
@ -569,21 +568,22 @@ struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const
struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct source_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct source_location loc) DECLSPEC_HIDDEN;
void hlsl_message(const char *fmt, ...) VKD3D_PRINTF_FUNC(1,2) DECLSPEC_HIDDEN; void hlsl_message(const char *fmt, ...) VKD3D_PRINTF_FUNC(1,2) DECLSPEC_HIDDEN;
void hlsl_report_message(const struct source_location loc, void hlsl_report_message(struct hlsl_ctx *ctx, const struct source_location loc,
enum hlsl_error_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(3,4) DECLSPEC_HIDDEN; enum hlsl_error_level level, const char *fmt, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN;
void hlsl_push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; void hlsl_push_scope(struct hlsl_ctx *ctx) DECLSPEC_HIDDEN;
void hlsl_pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; void hlsl_pop_scope(struct hlsl_ctx *ctx) DECLSPEC_HIDDEN;
bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type) DECLSPEC_HIDDEN;
struct hlsl_type *hlsl_type_clone(struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old,
unsigned int default_majority) DECLSPEC_HIDDEN;
bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN;
unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN;
bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN;
bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN;
int hlsl_lexer_compile(const char *text, const char *entrypoint) DECLSPEC_HIDDEN; int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint) DECLSPEC_HIDDEN;
int hlsl_parser_compile(const char *entrypoint) DECLSPEC_HIDDEN; int hlsl_parser_compile(struct hlsl_ctx *ctx, const char *entrypoint) DECLSPEC_HIDDEN;
#endif #endif

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

@ -24,17 +24,24 @@
#include "hlsl.h" #include "hlsl.h"
#include "hlsl.tab.h" #include "hlsl.tab.h"
static void update_location(HLSL_LTYPE *lloc); #define YYSTYPE HLSL_STYPE
#define YYLTYPE HLSL_LTYPE
#define YY_USER_ACTION update_location(&hlsl_lloc); static void update_location(struct hlsl_ctx *ctx, HLSL_LTYPE *loc);
#define YY_USER_ACTION update_location(yyget_extra(yyscanner), yyget_lloc(yyscanner));
%} %}
%option prefix="hlsl_" %option bison-bridge
%option bison-locations
%option extra-type="struct hlsl_ctx *"
%option never-interactive %option never-interactive
%option noinput %option noinput
%option nounput %option nounput
%option noyywrap %option noyywrap
%option prefix="hlsl_"
%option reentrant
%x pp pp_line pp_pragma pp_ignore %x pp pp_line pp_pragma pp_ignore
@ -52,21 +59,14 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]*
ANY (.) ANY (.)
%% %%
{RESERVED1} { {RESERVED1} |
hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); {RESERVED2} |
set_parse_status(&hlsl_ctx.status, PARSE_ERR); {RESERVED3} |
}
{RESERVED2} {
hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext);
set_parse_status(&hlsl_ctx.status, PARSE_ERR);
}
{RESERVED3} {
hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext);
set_parse_status(&hlsl_ctx.status, PARSE_ERR);
}
{RESERVED4} { {RESERVED4} {
hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); struct hlsl_ctx *ctx = yyget_extra(yyscanner);
set_parse_status(&hlsl_ctx.status, PARSE_ERR);
hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", ctx->line_no, yytext);
set_parse_status(&ctx->status, PARSE_ERR);
} }
BlendState {return KW_BLENDSTATE; } BlendState {return KW_BLENDSTATE; }
@ -168,37 +168,39 @@ column_major {return KW_COLUMN_MAJOR; }
row_major {return KW_ROW_MAJOR; } row_major {return KW_ROW_MAJOR; }
{IDENTIFIER} { {IDENTIFIER} {
hlsl_lval.name = vkd3d_strdup(yytext); struct hlsl_ctx *ctx = yyget_extra(yyscanner);
if (hlsl_get_var(hlsl_ctx.cur_scope, yytext) || hlsl_get_function(yytext))
yylval->name = vkd3d_strdup(yytext);
if (hlsl_get_var(ctx->cur_scope, yytext) || hlsl_get_function(ctx, yytext))
return VAR_IDENTIFIER; return VAR_IDENTIFIER;
else if (hlsl_get_type(hlsl_ctx.cur_scope, yytext, true)) else if (hlsl_get_type(ctx->cur_scope, yytext, true))
return TYPE_IDENTIFIER; return TYPE_IDENTIFIER;
else else
return NEW_IDENTIFIER; return NEW_IDENTIFIER;
} }
[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? { [0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F]? {
hlsl_lval.floatval = atof(yytext); yylval->floatval = atof(yytext);
return C_FLOAT; return C_FLOAT;
} }
[0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? { [0-9]+\.([eE][+-]?[0-9]+)?[h|H|f|F]? {
hlsl_lval.floatval = atof(yytext); yylval->floatval = atof(yytext);
return C_FLOAT; return C_FLOAT;
} }
[0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] { [0-9]+([eE][+-]?[0-9]+)?[h|H|f|F] {
hlsl_lval.floatval = atof(yytext); yylval->floatval = atof(yytext);
return C_FLOAT; return C_FLOAT;
} }
0x[0-9a-fA-F]+ { 0x[0-9a-fA-F]+ {
sscanf(yytext, "0x%x", &hlsl_lval.intval); sscanf(yytext, "0x%x", &yylval->intval);
return C_INTEGER; return C_INTEGER;
} }
0[0-7]+ { 0[0-7]+ {
sscanf(yytext, "0%o", &hlsl_lval.intval); sscanf(yytext, "0%o", &yylval->intval);
return C_INTEGER; return C_INTEGER;
} }
[0-9]+ { [0-9]+ {
hlsl_lval.intval = (atoi(yytext)); yylval->intval = (atoi(yytext));
return C_INTEGER; return C_INTEGER;
} }
@ -206,8 +208,10 @@ row_major {return KW_ROW_MAJOR; }
{WS}+ {} {WS}+ {}
{NEWLINE} { {NEWLINE} {
hlsl_ctx.line_no++; struct hlsl_ctx *ctx = yyget_extra(yyscanner);
hlsl_ctx.column = 1;
ctx->line_no++;
ctx->column = 1;
} }
^# { ^# {
@ -219,24 +223,30 @@ row_major {return KW_ROW_MAJOR; }
BEGIN(pp_pragma); BEGIN(pp_pragma);
} }
<pp_pragma>pack_matrix{WS}*\({WS}*row_major{WS}*\) { <pp_pragma>pack_matrix{WS}*\({WS}*row_major{WS}*\) {
struct hlsl_ctx *ctx = yyget_extra(yyscanner);
TRACE("#pragma setting row_major mode.\n"); TRACE("#pragma setting row_major mode.\n");
hlsl_ctx.matrix_majority = HLSL_ROW_MAJOR; ctx->matrix_majority = HLSL_ROW_MAJOR;
BEGIN(pp_ignore); BEGIN(pp_ignore);
} }
<pp_pragma>pack_matrix{WS}*\({WS}*column_major{WS}*\) { <pp_pragma>pack_matrix{WS}*\({WS}*column_major{WS}*\) {
struct hlsl_ctx *ctx = yyget_extra(yyscanner);
TRACE("#pragma setting column_major mode.\n"); TRACE("#pragma setting column_major mode.\n");
hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; ctx->matrix_majority = HLSL_COLUMN_MAJOR;
BEGIN(pp_ignore); BEGIN(pp_ignore);
} }
<pp_pragma>{NEWLINE} { <pp_pragma>{NEWLINE} {
FIXME("Unsupported preprocessor #pragma directive at line %u.\n", hlsl_ctx.line_no); struct hlsl_ctx *ctx = yyget_extra(yyscanner);
FIXME("Unsupported preprocessor #pragma directive at line %u.\n", ctx->line_no);
BEGIN(INITIAL); BEGIN(INITIAL);
} }
<pp_pragma>{ANY} {} <pp_pragma>{ANY} {}
<pp>[0-9]+ { <pp>[0-9]+ {
TRACE("Preprocessor line info.\n"); TRACE("Preprocessor line info.\n");
BEGIN(pp_line); BEGIN(pp_line);
hlsl_lval.intval = (atoi(yytext)); yylval->intval = (atoi(yytext));
return PRE_LINE; return PRE_LINE;
} }
<pp_line>{STRING} { <pp_line>{STRING} {
@ -244,7 +254,7 @@ row_major {return KW_ROW_MAJOR; }
BEGIN(pp_ignore); BEGIN(pp_ignore);
string[strlen(string) - 1] = 0; string[strlen(string) - 1] = 0;
hlsl_lval.name = string; yylval->name = string;
return STRING; return STRING;
} }
<pp_line>{WS}+ {} <pp_line>{WS}+ {}
@ -268,24 +278,26 @@ row_major {return KW_ROW_MAJOR; }
%% %%
static void update_location(HLSL_LTYPE *lloc) static void update_location(struct hlsl_ctx *ctx, HLSL_LTYPE *lloc)
{ {
lloc->file = hlsl_ctx.source_file; lloc->file = ctx->source_file;
lloc->col = hlsl_ctx.column; lloc->col = ctx->column;
lloc->line = hlsl_ctx.line_no; lloc->line = ctx->line_no;
hlsl_ctx.column += yyleng; ctx->column += yyget_leng(ctx->scanner);
} }
int hlsl_lexer_compile(const char *text, const char *entrypoint) int hlsl_lexer_compile(struct hlsl_ctx *ctx, const char *text, const char *entrypoint)
{ {
YY_BUFFER_STATE buffer; YY_BUFFER_STATE buffer;
int ret; int ret;
buffer = hlsl__scan_string(text); yylex_init_extra(ctx, &ctx->scanner);
hlsl__switch_to_buffer(buffer); buffer = hlsl__scan_string(text, ctx->scanner);
hlsl__switch_to_buffer(buffer, ctx->scanner);
ret = hlsl_parser_compile(entrypoint); ret = hlsl_parser_compile(ctx, entrypoint);
hlsl__delete_buffer(buffer); hlsl__delete_buffer(buffer, ctx->scanner);
yylex_destroy(ctx->scanner);
return ret; return ret;
} }

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

File diff suppressed because it is too large Load Diff