deUint32 result = 0;
-#define ARRAY_CHOICE(ARR) (ARR[rnd.getInt(0, DE_LENGTH_OF_ARRAY(ARR)-1)])
+#define ARRAY_CHOICE(ARR) ((ARR)[rnd.getInt(0, DE_LENGTH_OF_ARRAY(ARR)-1)])
result |= ARRAY_CHOICE(arrayUsageChoices);
result |= ARRAY_CHOICE(uniformFuncChoices);
{ \
for (int i = 0; i < valSize; i++) \
{ \
- if (unifValue.val.VAR_VALUE_MEMBER[i] != ZERO) \
+ if (unifValue.val.VAR_VALUE_MEMBER[i] != (ZERO)) \
{ \
log << TestLog::Message << "// FAILURE: uniform " << uniform.name << " has non-zero initial value" << TestLog::EndMessage; \
success = false; \