Maximum call stack depth increase

dEQP requires a stack depth of at least 33 for all tests to pass. Since the stack depth in swiftshader is arbitrary and doesn't actually depend on hardware, the maximum stack depth was increased from 16 to 64. Also added a bit of log info to make debugging easier. Fixes 2 dEQP tests: dEQP-GLES3.performance.compiler.optimization.function_inlining.32_nested_* Change-Id: I95ae335977d4eb3b21a54296b7fc5e6019595e66 Reviewed-on: https://swiftshader-review.googlesource.com/16328Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Maximum call stack depth increase
2e4c069a · Alexis Hetu · Alexis Hétu · 88e7dcfb · 2e4c069a · 2e4c069a
Commit 2e4c069a authored Jan 15, 2018 by Alexis Hetu Committed by Alexis Hétu Jan 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Compiler.cpp src/OpenGL/compiler/Compiler.cpp +5 -1

Shader.cpp src/OpenGL/libGLESv2/Shader.cpp +1 -1

No files found.
--- a/src/OpenGL/compiler/Compiler.cpp
+++ b/src/OpenGL/compiler/Compiler.cpp
@@ -227,7 +227,11 @@ bool TCompiler::validateCallDepth(TIntermNode *root, TInfoSink &infoSink)
 	else if(depth > maxCallStackDepth)
 	{
 		infoSink.info.prefix(EPrefixError);
-		infoSink.info << "Function call stack too deep";
+		infoSink.info << "Function call stack too deep (depth was ";
+		infoSink.info << depth;
+		infoSink.info << " while maximum call stack depth is ";
+		infoSink.info << maxCallStackDepth;
+		infoSink.info << ")";
 		return false;
 	}

--- a/src/OpenGL/libGLESv2/Shader.cpp
+++ b/src/OpenGL/libGLESv2/Shader.cpp
@@ -181,7 +181,7 @@ TranslatorASM *Shader::createCompiler(GLenum shaderType)
 	resources.OES_fragment_precision_high = 1;
 	resources.OES_EGL_image_external = 1;
 	resources.EXT_draw_buffers = 1;
-	resources.MaxCallStackDepth = 16;
+	resources.MaxCallStackDepth = 64;
 	assembler->Init(resources);
 	return assembler;