diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-04 09:37:48 +0100 |
| commit | ed474047e06f28fe740130f3bb13d3a40f4833a9 (patch) | |
| tree | 35a48f61c00ebb1f0579159c25dbbd1bfe812849 /mesalib/src/glsl/ir_clone.cpp | |
| parent | 3c0e16af61a9e0b6f9edab1d403adfaa85456599 (diff) | |
| parent | d4d629b77742e60caac3d120ff40e9f386380af2 (diff) | |
| download | vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.gz vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.tar.bz2 vcxsrv-ed474047e06f28fe740130f3bb13d3a40f4833a9.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013
Conflicts:
libX11/src/xkb/XKBGAlloc.c
libX11/src/xkb/XKBMisc.c
Diffstat (limited to 'mesalib/src/glsl/ir_clone.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_clone.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp index b94ff05df..4797451d7 100644 --- a/mesalib/src/glsl/ir_clone.cpp +++ b/mesalib/src/glsl/ir_clone.cpp @@ -252,6 +252,9 @@ ir_texture::clone(void *mem_ctx, struct hash_table *ht) const case ir_txs: new_tex->lod_info.lod = this->lod_info.lod->clone(mem_ctx, ht); break; + case ir_txf_ms: + new_tex->lod_info.sample_index = this->lod_info.sample_index->clone(mem_ctx, ht); + break; case ir_txd: new_tex->lod_info.grad.dPdx = this->lod_info.grad.dPdx->clone(mem_ctx, ht); new_tex->lod_info.grad.dPdy = this->lod_info.grad.dPdy->clone(mem_ctx, ht); |