ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dcompiler: Don't allow const variables without initializers.

This commit is contained in:
Matteo Bruni 2012-07-18 16:25:12 +02:00 committed by Alexandre Julliard
parent c9a42ca5fc
commit 110045816c
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/d3dcompiler_43/hlsl.y
View File

@ -640,11 +640,6 @@ declaration: var_modifiers type variables_def ';'
var->name = v->name;
var->modifiers = $1;
var->semantic = v->semantic;
if (v->initializer)
{
FIXME("Variable with an initializer.\n");
free_instr_list(v->initializer);
}
if (hlsl_ctx.cur_scope == hlsl_ctx.globals)
{
@ -652,11 +647,27 @@ declaration: var_modifiers type variables_def ';'
local = FALSE;
}
if (var->modifiers & HLSL_MODIFIER_CONST && !v->initializer)
{
hlsl_report_message(v->loc.file, v->loc.line, v->loc.col,
HLSL_LEVEL_ERROR, "const variable without initializer");
free_declaration(var);
d3dcompiler_free(v);
continue;
}
ret = declare_variable(var, local);
if (ret == FALSE)
if (!ret)
free_declaration(var);
else
TRACE("Declared variable %s.\n", var->name);
if (v->initializer)
{
FIXME("Variable with an initializer.\n");
free_instr_list(v->initializer);
}
d3dcompiler_free(v);
}
d3dcompiler_free($3);