Mesa (master): glsl: Allow ir_assignment() constructor to not specify condition.

Eric Anholt anholt at kemper.freedesktop.org
Wed Jun 29 22:23:14 UTC 2011


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

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jun 24 13:17:07 2011 -0700

glsl: Allow ir_assignment() constructor to not specify condition.

We almost never want to specify a condition, and when we do we're
already thinking about it (because we're writing a lowering pass
generating the condition), so a default argument should make the code
more pleasant to read.

NOTE: This is a candidate for the 7.11 branch (we want to be able to
cherry-pick future code).
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

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

diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index a419843..9d6ce7e 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -682,7 +682,7 @@ public:
 
 class ir_assignment : public ir_instruction {
 public:
-   ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs, ir_rvalue *condition);
+   ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs, ir_rvalue *condition = NULL);
 
    /**
     * Construct an assignment with an explicit write mask




More information about the mesa-commit mailing list