summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-07-12 13:55:10 -0700
committerIan Romanick <[email protected]>2010-07-20 17:10:05 -0700
commite340854115f2562109c91fa908ffe6628432f989 (patch)
tree137cd12923a0b14ca6352c2188ae81e15d7f67f6 /src
parente1acbfca322c4ac720707ec8d3fda08fab65a30b (diff)
glsl2: Move constant_expression_value method to ir_rvalue.
This prevents top-level callers from asking for the value of something that is guaranteed not to have one.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/ir.h4
-rw-r--r--src/glsl/ir_constant_expression.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 1d667be89c0..b6cd1bae31c 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -71,8 +71,6 @@ public:
enum ir_node_type ir_type;
const struct glsl_type *type;
- class ir_constant *constant_expression_value();
-
/** ir_print_visitor helper for debugging. */
void print(void) const;
@@ -114,6 +112,8 @@ protected:
class ir_rvalue : public ir_instruction {
public:
+ class ir_constant *constant_expression_value();
+
virtual ir_rvalue *clone(struct hash_table *) const = 0;
virtual ir_rvalue * as_rvalue()
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index ca834978f47..44f4a642099 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -96,7 +96,7 @@ public:
ir_constant *
-ir_instruction::constant_expression_value()
+ir_rvalue::constant_expression_value()
{
ir_constant_visitor visitor;