Mesa (main): glsl: Remove unused condition parameter from ir_assignment constructor

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Feb 11 17:59:12 UTC 2022


Module: Mesa
Branch: main
Commit: 231459ad26a2e56ba93dfc125dd4ed922290f375
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=231459ad26a2e56ba93dfc125dd4ed922290f375

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Jan 14 18:20:41 2022 -0800

glsl: Remove unused condition parameter from ir_assignment constructor

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14573>

---

 src/compiler/glsl/ir.cpp | 5 ++---
 src/compiler/glsl/ir.h   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/compiler/glsl/ir.cpp b/src/compiler/glsl/ir.cpp
index 99e084593bd..c8cb1ee249b 100644
--- a/src/compiler/glsl/ir.cpp
+++ b/src/compiler/glsl/ir.cpp
@@ -162,11 +162,10 @@ ir_assignment::ir_assignment(ir_dereference *lhs, ir_rvalue *rhs,
       assert(util_bitcount(write_mask) == this->rhs->type->vector_elements);
 }
 
-ir_assignment::ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs,
-			     ir_rvalue *condition)
+ir_assignment::ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs)
    : ir_instruction(ir_type_assignment)
 {
-   this->condition = condition;
+   this->condition = NULL;
    this->rhs = rhs;
 
    /* If the RHS is a vector type, assume that all components of the vector
diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h
index 744e0fe6f74..4ec62db8074 100644
--- a/src/compiler/glsl/ir.h
+++ b/src/compiler/glsl/ir.h
@@ -1463,7 +1463,7 @@ public:
 
 class ir_assignment : public ir_instruction {
 public:
-   ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs, ir_rvalue *condition = NULL);
+   ir_assignment(ir_rvalue *lhs, ir_rvalue *rhs);
 
    /**
     * Construct an assignment with an explicit write mask



More information about the mesa-commit mailing list