Mesa (glsl2): ir_reader: Don' t mark functions as defined if their body is empty.

Ian Romanick idr at kemper.freedesktop.org
Sat Aug 14 02:35:10 UTC 2010


Module: Mesa
Branch: glsl2
Commit: d802ba110f78c3eee9541867cde819ada1b2c449
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d802ba110f78c3eee9541867cde819ada1b2c449

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Aug 12 13:17:53 2010 -0700

ir_reader: Don't mark functions as defined if their body is empty.

---

 src/glsl/ir_reader.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index 14bd2d6..2def3ef 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -297,7 +297,7 @@ read_function_sig(_mesa_glsl_parse_state *st, ir_function *f, s_list *list,
 
    sig->replace_parameters(&hir_parameters);
 
-   if (!skip_body) {
+   if (!skip_body && !body_list->subexpressions.is_empty()) {
       if (sig->is_defined) {
 	 ir_read_error(st, list, "function %s redefined", f->name);
 	 return;




More information about the mesa-commit mailing list