+merged with master

This commit is contained in:
Evghenii
2013-12-18 11:37:01 +01:00
80 changed files with 257 additions and 162226 deletions

View File

@@ -1266,6 +1266,13 @@ packed_store_active(uniform unsigned int a[],
return __packed_store_active(a, vals, (UIntMaskType)__mask);
}
static inline uniform int
packed_store_active2(uniform unsigned int a[],
unsigned int vals) {
return __packed_store_active2(a, vals, (UIntMaskType)__mask);
}
static inline uniform int
packed_load_active(uniform int a[], varying int * uniform vals) {
return __packed_load_active(a, vals, (IntMaskType)__mask);
@@ -1281,6 +1288,12 @@ packed_store_active(bool active, uniform int a[], int vals) {
return __packed_store_active(a, vals, (IntMaskType)(-(int)active));
}
static inline uniform int
packed_store_active2(uniform int a[], int vals) {
return __packed_store_active2(a, vals, (IntMaskType)__mask);
}
///////////////////////////////////////////////////////////////////////////
// System information