aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-13 11:42:04 +0200
committermarha <marha@users.sourceforge.net>2012-04-13 11:42:04 +0200
commitd2d4fd66a0c1fca50d07fce3f383d6a84a57f09a (patch)
treeb50ae20ca22bc564b145906d6c84395285933859 /mesalib/src/mesa/program
parent120bd371deb2b73a0bae5ce331511e4ea27bcff2 (diff)
parentfffd436e9c2ec6f5aa501ee57d0e4ade7293ee60 (diff)
downloadvcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.tar.gz
vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.tar.bz2
vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/program')
-rw-r--r--mesalib/src/mesa/program/ir_to_mesa.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index 6f4a095dd..840648e04 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -2358,7 +2358,7 @@ class add_uniform_to_shader : public uniform_field_visitor {
public:
add_uniform_to_shader(struct gl_shader_program *shader_program,
struct gl_program_parameter_list *params)
- : shader_program(shader_program), params(params)
+ : shader_program(shader_program), params(params), idx(-1)
{
/* empty */
}