Mesa (glsl2): ir_function_inlining: Fix missing iter.next() in inlining sampler params.

Eric Anholt anholt at kemper.freedesktop.org
Fri Aug 6 21:18:16 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 58f1ffdd7c64c0c0962d2aaacdde8f55edefbb2c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58f1ffdd7c64c0c0962d2aaacdde8f55edefbb2c

Author: Aras Pranckevicius <aras at unity3d.com>
Date:   Fri Aug  6 12:31:56 2010 +0200

ir_function_inlining: Fix missing iter.next() in inlining sampler params.

Fixes glsl-fs-function-samplers.

---

 src/glsl/ir_function_inlining.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/glsl/ir_function_inlining.cpp b/src/glsl/ir_function_inlining.cpp
index 35eb2b3..fd52d10 100644
--- a/src/glsl/ir_function_inlining.cpp
+++ b/src/glsl/ir_function_inlining.cpp
@@ -196,6 +196,8 @@ ir_call::generate_inline(ir_instruction *next_ir)
 	 assert(deref);
 	 do_sampler_replacement(&new_instructions, sig_param, deref);
       }
+      param_iter.next();
+      sig_param_iter.next();
    }
 
    /* Now push those new instructions in. */




More information about the mesa-commit mailing list