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

Fix crash from attempting ES precision propagation through a constant folded built-in function call when the expression tree has unknown precisions.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24267 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-12-02 16:38:53 +00:00
parent 98434bed00
commit 78fe3ace85
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Test/300.frag
View File

@ -129,5 +129,11 @@ void foo23()
textureOffset(s2DShadow, c3D, ivec2(-9, 8), c1D); textureOffset(s2DShadow, c3D, ivec2(-9, 8), c1D);
} }
void foo324(void)
{
float p = pow(3.2, 4.6);
p += sin(0.4);
}
float imageBuffer; // ERROR, reserved float imageBuffer; // ERROR, reserved
float uimage2DRect; // ERROR, reserved float uimage2DRect; // ERROR, reserved

16
Test/baseResults/300.frag.out
View File

@ -33,8 +33,8 @@ ERROR: 0:122: '=' : can't use with samplers or structs containing samplers
ERROR: 0:123: '==' : can't use with samplers or structs containing samplers ERROR: 0:123: '==' : can't use with samplers or structs containing samplers
ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset] ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset] ERROR: 0:129: 'texel offset' : value is out of range: [gl_MinProgramTexelOffset, gl_MaxProgramTexelOffset]
ERROR: 0:132: 'imageBuffer' : Reserved word. ERROR: 0:138: 'imageBuffer' : Reserved word.
ERROR: 0:132: '' : syntax error ERROR: 0:138: '' : syntax error
ERROR: 36 compilation errors. No code generated. ERROR: 36 compilation errors. No code generated.
@ -280,6 +280,18 @@ ERROR: node is still EOpNull!
0:129 -9 (const int) 0:129 -9 (const int)
0:129 8 (const int) 0:129 8 (const int)
0:129 'c1D' (smooth in lowp float) 0:129 'c1D' (smooth in lowp float)
0:132 Function Definition: foo324( (void)
0:132 Function Parameters:
0:134 Sequence
0:134 Sequence
0:134 move second child to first child (lowp float)
0:134 'p' (lowp float)
0:134 Constant:
0:134 210.712306
0:135 add second child into first child (lowp float)
0:135 'p' (lowp float)
0:135 Constant:
0:135 0.389418
0:? Linker Objects 0:? Linker Objects
0:? 's2D' (uniform lowp sampler2D) 0:? 's2D' (uniform lowp sampler2D)
0:? 's3D' (uniform lowp sampler3D) 0:? 's3D' (uniform lowp sampler3D)

3
glslang/MachineIndependent/Intermediate.cpp
View File

@ -299,6 +299,8 @@ TIntermTyped* TIntermediate::addBuiltInFunctionCall(TSourceLoc loc, TOperator op
// setAggregateOperater() calls fold() for constant folding // setAggregateOperater() calls fold() for constant folding
TIntermTyped* node = setAggregateOperator(childNode, op, returnType, loc); TIntermTyped* node = setAggregateOperator(childNode, op, returnType, loc);
// if not folded, we'll still have an aggregate node to propagate precision with
if (node->getAsAggregate()) {
TPrecisionQualifier correctPrecision = returnType.getQualifier().precision; TPrecisionQualifier correctPrecision = returnType.getQualifier().precision;
if (correctPrecision == EpqNone && profile == EEsProfile) { if (correctPrecision == EpqNone && profile == EEsProfile) {
// find the maximum precision from the arguments, for the built-in's return precision // find the maximum precision from the arguments, for the built-in's return precision
@ -311,6 +313,7 @@ TIntermTyped* TIntermediate::addBuiltInFunctionCall(TSourceLoc loc, TOperator op
// when a precision is found, so start by clearing this subroot precision // when a precision is found, so start by clearing this subroot precision
node->getQualifier().precision = EpqNone; node->getQualifier().precision = EpqNone;
node->propagatePrecision(correctPrecision); node->propagatePrecision(correctPrecision);
}
return node; return node;
} }