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: Return void from hlsl_pop_scope().

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-02 16:11:16 -06:00 committed by Alexandre Julliard
parent db1765c283
commit aa52cb10b4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,15 +537,13 @@ 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);
} }
BOOL hlsl_pop_scope(struct hlsl_parse_ctx *ctx) void hlsl_pop_scope(struct hlsl_parse_ctx *ctx)
{ {
struct hlsl_scope *prev_scope = ctx->cur_scope->upper; struct hlsl_scope *prev_scope = ctx->cur_scope->upper;
if (!prev_scope) assert(prev_scope);
return FALSE;
TRACE("Popping current scope.\n"); TRACE("Popping current scope.\n");
ctx->cur_scope = prev_scope; ctx->cur_scope = prev_scope;
return TRUE;
} }
static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2) static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hlsl_type *t2)

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

@ -646,7 +646,7 @@ void hlsl_report_message(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(3,4) DECLSPEC_HIDDEN;
void hlsl_push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; void hlsl_push_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN;
BOOL hlsl_pop_scope(struct hlsl_parse_ctx *ctx) DECLSPEC_HIDDEN; void hlsl_pop_scope(struct hlsl_parse_ctx *ctx) 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_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;