Commit c2ef506d authored by Alexis Hetu's avatar Alexis Hetu Committed by Commit Bot

Only run viz_unittest tests using rectangle textures when supported

In the context of replacing SwiftShader GL with SwANGLE (ANGLE +
SwiftShader Vulkan), which doesn't plan on adding support for
rectangle textures, make sure tests which use rectangle textures
are skipped when the feature is not supported.

Bug: chromium:1061151
Change-Id: Ie0467a5aecdd024bcbb28c5e058d2588cc3bb5e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418976Reviewed-by: default avatardanakj <danakj@chromium.org>
Commit-Queue: Alexis Hétu <sugoi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808455}
parent 0837e8e4
...@@ -410,10 +410,10 @@ class GLRendererShaderPixelTest : public cc::PixelTest { ...@@ -410,10 +410,10 @@ class GLRendererShaderPixelTest : public cc::PixelTest {
UVTextureMode uv_modes[2] = {UV_TEXTURE_MODE_UV, UV_TEXTURE_MODE_U_V}; UVTextureMode uv_modes[2] = {UV_TEXTURE_MODE_UV, UV_TEXTURE_MODE_U_V};
YUVAlphaTextureMode a_modes[2] = {YUV_NO_ALPHA_TEXTURE, YUVAlphaTextureMode a_modes[2] = {YUV_NO_ALPHA_TEXTURE,
YUV_HAS_ALPHA_TEXTURE}; YUV_HAS_ALPHA_TEXTURE};
for (int j = 0; j < 2; j++) { for (auto uv_mode : uv_modes) {
for (int k = 0; k < 2; k++) { for (auto a_mode : a_modes) {
TestShader(ProgramKey::YUVVideo(precision, sampler, a_modes[j], TestShader(ProgramKey::YUVVideo(precision, sampler, a_mode, uv_mode,
uv_modes[k], false, false)); false, false));
} }
} }
} }
...@@ -498,8 +498,11 @@ class PrecisionSamplerShaderPixelTest ...@@ -498,8 +498,11 @@ class PrecisionSamplerShaderPixelTest
std::tuple<TexCoordPrecision, SamplerType>> {}; std::tuple<TexCoordPrecision, SamplerType>> {};
TEST_P(PrecisionSamplerShaderPixelTest, ShadersCompile) { TEST_P(PrecisionSamplerShaderPixelTest, ShadersCompile) {
TestShadersWithPrecisionAndSampler(std::get<0>(GetParam()), SamplerType sampler = std::get<1>(GetParam());
std::get<1>(GetParam())); if (sampler != SAMPLER_TYPE_2D_RECT ||
context_provider()->ContextCapabilities().texture_rectangle) {
TestShadersWithPrecisionAndSampler(std::get<0>(GetParam()), sampler);
}
} }
INSTANTIATE_TEST_SUITE_P(PrecisionSamplerShadersCompile, INSTANTIATE_TEST_SUITE_P(PrecisionSamplerShadersCompile,
...@@ -513,8 +516,12 @@ class MaskShaderPixelTest ...@@ -513,8 +516,12 @@ class MaskShaderPixelTest
std::tuple<TexCoordPrecision, SamplerType, BlendMode, bool>> {}; std::tuple<TexCoordPrecision, SamplerType, BlendMode, bool>> {};
TEST_P(MaskShaderPixelTest, ShadersCompile) { TEST_P(MaskShaderPixelTest, ShadersCompile) {
TestShadersWithMasks(std::get<0>(GetParam()), std::get<1>(GetParam()), SamplerType sampler = std::get<1>(GetParam());
std::get<2>(GetParam()), std::get<3>(GetParam())); if (sampler != SAMPLER_TYPE_2D_RECT ||
context_provider()->ContextCapabilities().texture_rectangle) {
TestShadersWithMasks(std::get<0>(GetParam()), sampler,
std::get<2>(GetParam()), std::get<3>(GetParam()));
}
} }
INSTANTIATE_TEST_SUITE_P(MaskShadersCompile, INSTANTIATE_TEST_SUITE_P(MaskShadersCompile,
......
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