Commit 6655878f by Austin Kinross Committed by Jamie Madill

UniformTest.SamplerUniformsAppearOnce should check for VTF support

Change-Id: If4b1602a5f706b5343fc1757962341602354b88e Reviewed-on: https://chromium-review.googlesource.com/304389Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tryjob-Request: Jamie Madill <jmadill@chromium.org> Tested-by: 's avatarAustin Kinross <aukinros@microsoft.com>
parent d4d5084b
...@@ -454,6 +454,15 @@ TEST_P(UniformTestES3, TranposedMatrixArrayUniformStateQuery) ...@@ -454,6 +454,15 @@ TEST_P(UniformTestES3, TranposedMatrixArrayUniformStateQuery)
// Check that sampler uniforms only show up one time in the list // Check that sampler uniforms only show up one time in the list
TEST_P(UniformTest, SamplerUniformsAppearOnce) TEST_P(UniformTest, SamplerUniformsAppearOnce)
{ {
int maxVertexTextureImageUnits = 0;
glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &maxVertexTextureImageUnits);
if (maxVertexTextureImageUnits == 0)
{
std::cout << "Renderer doesn't support vertex texture fetch, skipping test" << std::endl;
return;
}
const std::string &vertShader = const std::string &vertShader =
"attribute vec2 position;\n" "attribute vec2 position;\n"
"uniform sampler2D tex2D;\n" "uniform sampler2D tex2D;\n"
...@@ -492,7 +501,7 @@ TEST_P(UniformTest, SamplerUniformsAppearOnce) ...@@ -492,7 +501,7 @@ TEST_P(UniformTest, SamplerUniformsAppearOnce)
} }
// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against. // Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
ANGLE_INSTANTIATE_TEST(UniformTest, ES2_D3D9(), ES2_D3D11(), ES2_OPENGL()); ANGLE_INSTANTIATE_TEST(UniformTest, ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES2_OPENGL());
ANGLE_INSTANTIATE_TEST(UniformTestES3, ES3_D3D11(), ES3_OPENGL()); ANGLE_INSTANTIATE_TEST(UniformTestES3, ES3_D3D11(), ES3_OPENGL());
} // namespace } // namespace
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