diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-15 08:22:54 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-15 08:22:54 +0100 |
| commit | 0b2fa092281e667dbb02942008b16510af1086ef (patch) | |
| tree | 350352f14a2a6f98d2f5a5356eb63aeae67d6047 /mesalib/src/glsl/ir.h | |
| parent | 1de47a7fc53a67beccab830178aaa0118ed4734f (diff) | |
| parent | 6f6a2340d40759b77ef43965efdd24f3e4e623fd (diff) | |
| download | vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.tar.gz vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.tar.bz2 vcxsrv-0b2fa092281e667dbb02942008b16510af1086ef.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
Diffstat (limited to 'mesalib/src/glsl/ir.h')
| -rw-r--r-- | mesalib/src/glsl/ir.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index efd80dad8..1e09988e5 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -1448,8 +1448,8 @@ enum ir_texture_opcode { class ir_texture : public ir_rvalue { public: ir_texture(enum ir_texture_opcode op) - : op(op), coordinate(NULL), projector(NULL), shadow_comparitor(NULL), - offset(NULL) + : op(op), sampler(NULL), coordinate(NULL), projector(NULL), + shadow_comparitor(NULL), offset(NULL) { this->ir_type = ir_type_texture; } |