marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dcompiler: Check for missing return value semantics on the entry point. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Zebediah Figura 2020-06-08 16:49:38 -05:00 committed by Alexandre Julliard
parent d5486b6bb5
commit fdb3db5275
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dlls/d3dcompiler_43/hlsl.y
View File

@ -2971,7 +2971,34 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino
hlsl_parse();
TRACE("Compilation status = %d\n", hlsl_ctx.status);
if (hlsl_ctx.status == PARSE_ERR)
goto out;
if (!(entry_func = get_func_entry(entrypoint)))
{
hlsl_message("error: entry point %s is not defined\n", debugstr_a(entrypoint));
goto out;
}
if (!type_is_void(entry_func->return_type)
&& entry_func->return_type->type != HLSL_CLASS_STRUCT && !entry_func->semantic)
{
hlsl_report_message(entry_func->loc, HLSL_LEVEL_ERROR,
"entry point \"%s\" is missing a return value semantic", entry_func->func->name);
}
/* Index 0 means unused; index 1 means function entry, so start at 2. */
index_instructions(entry_func->body, 2);
if (TRACE_ON(hlsl_parser))
{
TRACE("IR dump.\n");
wine_rb_for_each_entry(&hlsl_ctx.functions, dump_function, NULL);
}
compute_liveness(entry_func);
out:
if (messages)
{
if (hlsl_ctx.messages.size)
@ -2989,27 +3016,6 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino
d3dcompiler_free((void *)hlsl_ctx.source_files[i]);
d3dcompiler_free(hlsl_ctx.source_files);
if (hlsl_ctx.status == PARSE_ERR)
goto out;
if (!(entry_func = get_func_entry(entrypoint)))
{
hlsl_message("error: entry point %s is not defined\n", debugstr_a(entrypoint));
goto out;
}
/* Index 0 means unused; index 1 means function entry, so start at 2. */
index_instructions(entry_func->body, 2);
if (TRACE_ON(hlsl_parser))
{
TRACE("IR dump.\n");
wine_rb_for_each_entry(&hlsl_ctx.functions, dump_function, NULL);
}
compute_liveness(entry_func);
out:
TRACE("Freeing functions IR.\n");
wine_rb_destroy(&hlsl_ctx.functions, free_function_rb, NULL);

12
dlls/d3dcompiler_43/tests/hlsl_d3d9.c
View File

@ -1133,6 +1133,18 @@ static void test_fail(void)
"{\n"
" return float4(0, 0, 0, 0);\n"
"}",
/* 15 */
"float4 test()\n"
"{\n"
" return float4(0, 0, 0, 0);\n"
"}",
"float4 test(out float4 o : SV_TARGET)\n"
"{\n"
" o = float4(1, 1, 1, 1);\n"
" return float4(0, 0, 0, 0);\n"
"}",
};
static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"};