diff options
author | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
commit | b3f7d4f6ce0d42d826f384223144936ba6797a10 (patch) | |
tree | 2f329beffff890b402625bff8547e243071c47bd /mesalib/src/glsl/lower_clip_distance.cpp | |
parent | c648afe73ef43a15094508d2dd439e05738735bf (diff) | |
parent | 840c8745518b92303d40f6834e9c616587242231 (diff) | |
download | vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.gz vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.bz2 vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXft pixman mesa git update 17 dec 2012
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/glsl/lower_clip_distance.cpp')
-rw-r--r-- | mesalib/src/glsl/lower_clip_distance.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesalib/src/glsl/lower_clip_distance.cpp b/mesalib/src/glsl/lower_clip_distance.cpp index 031691471..09bdc36e1 100644 --- a/mesalib/src/glsl/lower_clip_distance.cpp +++ b/mesalib/src/glsl/lower_clip_distance.cpp @@ -45,6 +45,7 @@ * LowerClipDistance flag in gl_shader_compiler_options to true. */ +#include "glsl_symbol_table.h" #include "ir_hierarchical_visitor.h" #include "ir.h" @@ -334,11 +335,14 @@ lower_clip_distance_visitor::visit_leave(ir_call *ir) bool -lower_clip_distance(exec_list *instructions) +lower_clip_distance(gl_shader *shader) { lower_clip_distance_visitor v; - visit_list_elements(&v, instructions); + visit_list_elements(&v, shader->ir); + + if (v.new_clip_distance_var) + shader->symbols->add_variable(v.new_clip_distance_var); return v.progress; } |