Fixed glsl-optimizer crash on Linux (GCC4.7.2 inlining bug?!).

bkaradzic · Mar 18, 2013 · 2936474 · 2936474
1 parent 368fddf
commit 2936474
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/3rdparty/glsl-optimizer/src/glsl/ir_function_detect_recursion.cpp b/3rdparty/glsl-optimizer/src/glsl/ir_function_detect_recursion.cpp
@@ -239,6 +239,11 @@ class has_recursion_visitor : public ir_hierarchical_visitor {
    bool progress;
 };
 
+#if defined(__GNUC__)
+// BK - 'gcc (Ubuntu/Linaro 4.7.2-2ubuntu1) 4.7.2'
+// If destroy_links is inlined code crashes in n->remove().
+__attribute__((noinline))
+#endif // defined(__GNUC__)
 static void
 destroy_links(exec_list *list, function *f)
 {

diff --git a/tools/bin/geometryc b/tools/bin/geometryc
diff --git a/tools/bin/shaderc b/tools/bin/shaderc