diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-03 13:53:39 +0200 |
| commit | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (patch) | |
| tree | 4b8d3a482e5905f6efb32f5843f1c6fc75d4fe19 /mesalib/src/glsl/ir.h | |
| parent | c3594c6c050a987fb891a1c7cf0c83102fbbec46 (diff) | |
| parent | 5593a3d2f370e3e12a043110bf2e395c938980d6 (diff) | |
| download | vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.gz vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.tar.bz2 vcxsrv-7d29f4054380e7f42722c280b9caedce9fa4ace9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xkeyboard-config git update 3 Oct 2003
Conflicts:
xorg-server/xkeyboard-config/symbols/level3
xorg-server/xkeyboard-config/symbols/level5
Diffstat (limited to 'mesalib/src/glsl/ir.h')
| -rw-r--r-- | mesalib/src/glsl/ir.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index 6c5630b09..885837a7a 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -1559,7 +1559,8 @@ enum ir_texture_opcode { ir_txf, /**< Texel fetch with explicit LOD */ ir_txf_ms, /**< Multisample texture fetch */ ir_txs, /**< Texture size */ - ir_lod /**< Texture lod query */ + ir_lod, /**< Texture lod query */ + ir_tg4 /**< Texture gather */ }; @@ -1584,6 +1585,7 @@ enum ir_texture_opcode { * <type> <sampler> <coordinate> <sample_index>) * (txs <type> <sampler> <lod>) * (lod <type> <sampler> <coordinate>) + * (tg4 <type> <sampler> <coordinate> 0) */ class ir_texture : public ir_rvalue { public: |