Commit ad6c0452 by Yuly Novikov Committed by Commit Bot

Skip SamplerInStruct AsFunctionParameter tests on Adreno Android GLES

Due to Adreno bug in compiling struct function parameter in shader. BUG=angleproject:1427 TEST=SamplerInStructAsFunctionParameterTest SamplerInStructArrayAsFunctionParameterTest SamplerInNestedStructAsFunctionParameterTest Change-Id: I979312885f2047e78b61530c97703854a4be1586 Reviewed-on: https://chromium-review.googlesource.com/356125Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent b13e0a5b
...@@ -2756,6 +2756,12 @@ TEST_P(SamplerInStructTest, SamplerInStruct) ...@@ -2756,6 +2756,12 @@ TEST_P(SamplerInStructTest, SamplerInStruct)
// Use a sampler in a uniform struct that's passed as a function parameter. // Use a sampler in a uniform struct that's passed as a function parameter.
TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParameter) TEST_P(SamplerInStructAsFunctionParameterTest, SamplerInStructAsFunctionParameter)
{ {
// TODO(ynovikov): re-enable once root cause of http://anglebug.com/1427 is fixed
if (IsAndroid() && IsAdreno() && IsOpenGLES())
{
std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
return;
}
runSamplerInStructTest(); runSamplerInStructTest();
} }
...@@ -2768,6 +2774,12 @@ TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFuncti ...@@ -2768,6 +2774,12 @@ TEST_P(SamplerInStructArrayAsFunctionParameterTest, SamplerInStructArrayAsFuncti
std::cout << "Test skipped on Intel OpenGL." << std::endl; std::cout << "Test skipped on Intel OpenGL." << std::endl;
return; return;
} }
// TODO(ynovikov): re-enable once root cause of http://anglebug.com/1427 is fixed
if (IsAndroid() && IsAdreno() && IsOpenGLES())
{
std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
return;
}
runSamplerInStructTest(); runSamplerInStructTest();
} }
...@@ -2780,6 +2792,12 @@ TEST_P(SamplerInNestedStructAsFunctionParameterTest, SamplerInNestedStructAsFunc ...@@ -2780,6 +2792,12 @@ TEST_P(SamplerInNestedStructAsFunctionParameterTest, SamplerInNestedStructAsFunc
std::cout << "Test skipped on Intel OpenGL." << std::endl; std::cout << "Test skipped on Intel OpenGL." << std::endl;
return; return;
} }
// TODO(ynovikov): re-enable once root cause of http://anglebug.com/1427 is fixed
if (IsAndroid() && IsAdreno() && IsOpenGLES())
{
std::cout << "Test skipped on Adreno OpenGLES on Android." << std::endl;
return;
}
runSamplerInStructTest(); runSamplerInStructTest();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment