mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #327 from steve-lunarg/empty-statement-fix

Browse Source 
HLSL: Fix for empty statement segfault
This commit is contained in:
John Kessenich 2016-06-03 12:20:49 -06:00
commit 54e3bb8a4e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Test/hlsl.intrinsics.vert
View File

@ -298,7 +298,7 @@ float4 VertexShaderFunction(float4 inF0, float4 inF1, float4 inF2)
float2x2 VertexShaderFunction(float2x2 inF0, float2x2 inF1, float2x2 inF2) float2x2 VertexShaderFunction(float2x2 inF0, float2x2 inF1, float2x2 inF2)
{ {
// TODO: FXC doesn't accept this with (), but glslang doesn't accept it without. // TODO: FXC doesn't accept this with (), but glslang doesn't accept it without.
MATFNS() MATFNS();
// TODO: ... add when float1 prototypes are generated // TODO: ... add when float1 prototypes are generated
return float2x2(2,2,2,2); return float2x2(2,2,2,2);
@ -307,7 +307,7 @@ float2x2 VertexShaderFunction(float2x2 inF0, float2x2 inF1, float2x2 inF2)
float3x3 VertexShaderFunction(float3x3 inF0, float3x3 inF1, float3x3 inF2) float3x3 VertexShaderFunction(float3x3 inF0, float3x3 inF1, float3x3 inF2)
{ {
// TODO: FXC doesn't accept this with (), but glslang doesn't accept it without. // TODO: FXC doesn't accept this with (), but glslang doesn't accept it without.
MATFNS() MATFNS();
// TODO: ... add when float1 prototypes are generated // TODO: ... add when float1 prototypes are generated
return float3x3(3,3,3,3,3,3,3,3,3); return float3x3(3,3,3,3,3,3,3,3,3);
@ -316,7 +316,7 @@ float3x3 VertexShaderFunction(float3x3 inF0, float3x3 inF1, float3x3 inF2)
float4x4 VertexShaderFunction(float4x4 inF0, float4x4 inF1, float4x4 inF2) float4x4 VertexShaderFunction(float4x4 inF0, float4x4 inF1, float4x4 inF2)
{ {
// TODO: FXC doesn't accept this with (), but glslang doesn't accept it without. // TODO: FXC doesn't accept this with (), but glslang doesn't accept it without.
MATFNS() MATFNS();
// TODO: ... add when float1 prototypes are generated // TODO: ... add when float1 prototypes are generated
return float4x4(4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4); return float4x4(4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4);

2
hlsl/hlslGrammar.cpp
View File

@ -492,6 +492,8 @@ bool HlslGrammar::acceptFunctionDefinition(TFunction& function, TIntermNode*& no
// //
bool HlslGrammar::acceptExpression(TIntermTyped*& node) bool HlslGrammar::acceptExpression(TIntermTyped*& node)
{ {
node = nullptr;
// assignment_expression // assignment_expression
if (! acceptAssignmentExpression(node)) if (! acceptAssignmentExpression(node))
return false; return false;