Mesa (10.1): glsl: Initialize ubo_binding_mask flags to zero.

Ian Romanick idr at kemper.freedesktop.org
Sat Feb 8 01:10:20 UTC 2014


Module: Mesa
Branch: 10.1
Commit: 7aa84761b6afce722c4a1ad94cdbcf4282f3b7ad
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7aa84761b6afce722c4a1ad94cdbcf4282f3b7ad

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Feb  3 11:51:51 2014 -0800

glsl: Initialize ubo_binding_mask flags to zero.

Missed in commit e63bb298. Caused sporadic test failures, like
incorrect-in-layout-qualifier-repeated-prim.geom.

Cc: "10.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
(cherry picked from commit e2ef93cf94ee553e5de70a7c26fd0724d967d0b2)

---

 src/glsl/ast_type.cpp |    1 +
 1 file changed, 1 insertion(+)

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index 637da0d..5069326 100644
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -118,6 +118,7 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc,
    ubo_layout_mask.flags.q.shared = 1;
 
    ast_type_qualifier ubo_binding_mask;
+   ubo_binding_mask.flags.i = 0;
    ubo_binding_mask.flags.q.explicit_binding = 1;
    ubo_binding_mask.flags.q.explicit_offset = 1;
 




More information about the mesa-commit mailing list