summaryrefslogtreecommitdiff
path: root/ir.h
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2010-06-11 16:57:47 -0700
committerIan Romanick <ian.d.romanick@intel.com>2010-06-11 17:12:40 -0700
commit824b659d917a5f14a1f66b891d25036ef9f9adc6 (patch)
treeacf17b61781f61275a546e8cd37de76617f231af /ir.h
parentb74b43e4ba27a9b2e9da0f3499af261a4b997b00 (diff)
ir_constant: Eliminate 'void *' constructor
All of the places that had been using the (glsl_type *, void *) constructor were actually passing an ir_constant_data for the 'void *'. The code can be greatly simplified by replacing this constructor with a (glsl_type *, ir_constant_data *) constructor. This should also help prevent one class of invalid uses of the old constructor.
Diffstat (limited to 'ir.h')
-rw-r--r--ir.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ir.h b/ir.h
index 1fdd125d8a..33b6069ea5 100644
--- a/ir.h
+++ b/ir.h
@@ -1031,7 +1031,7 @@ union ir_constant_data {
class ir_constant : public ir_rvalue {
public:
- ir_constant(const struct glsl_type *type, const void *data);
+ ir_constant(const struct glsl_type *type, const ir_constant_data *data);
ir_constant(bool b);
ir_constant(unsigned int u);
ir_constant(int i);