release-request-61d3cb4a-920f-4754-aa86-b994b96b3c45-for-aosp-marshmallow-cts-release-4211804 snap-temp-L95400000085735514
Change-Id: If37d94c969d831dd7ab01d4a4c24d797073b572f
diff --git a/modules/gles31/functional/es31fShaderAtomicOpTests.cpp b/modules/gles31/functional/es31fShaderAtomicOpTests.cpp
index 1e37be0..01503cf 100644
--- a/modules/gles31/functional/es31fShaderAtomicOpTests.cpp
+++ b/modules/gles31/functional/es31fShaderAtomicOpTests.cpp
@@ -751,7 +751,7 @@
const int numWorkGroups = numValues/workGroupSize;
const int numBits = m_precision == PRECISION_HIGHP ? 32 :
m_precision == PRECISION_MEDIUMP ? 16 : 8;
- const deUint32 compareMask = (m_type == TYPE_UINT || numBits == 32) ? ~0u : (1u<<numBits)-1u;
+ const deUint32 compareMask = numBits == 32 ? ~0u : (1u<<numBits)-1u;
for (int groupNdx = 0; groupNdx < numWorkGroups; groupNdx++)
{
@@ -783,10 +783,10 @@
{
const deUint32 outputValue = *(const deUint32*)((const deUint8*)outputs + outputStride*(groupOffset+localNdx));
- if ((outputValue&compareMask) != 0 &&
- (outputValue&compareMask) != compareMask &&
- (outputValue&compareMask) != (expected0&compareMask) &&
- (outputValue&compareMask) != (expected1&compareMask))
+ if ((outputValue & compareMask) != 0 &&
+ (outputValue & compareMask) != compareMask &&
+ (outputValue & compareMask) != (expected0&compareMask) &&
+ (outputValue & compareMask) != (expected1&compareMask))
{
m_testCtx.getLog() << TestLog::Message << "ERROR: at group " << groupNdx << ", invocation " << localNdx
<< ": found unexpected value " << tcu::toHex(outputValue)
