| Index: gpu/command_buffer/service/test_helper.cc
|
| diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc
|
| index c3efa89204d5a794337be84ec63c1a6c9f54683f..c12f872f71b675b901eee87c816f2a1e83b74628 100644
|
| --- a/gpu/command_buffer/service/test_helper.cc
|
| +++ b/gpu/command_buffer/service/test_helper.cc
|
| @@ -560,28 +560,49 @@ void TestHelper::SetupExpectationsForClearingUniforms(
|
| case GL_SAMPLER_EXTERNAL_OES:
|
| case GL_SAMPLER_3D_OES:
|
| case GL_SAMPLER_2D_RECT_ARB:
|
| + case GL_SAMPLER_2D_ARRAY:
|
| EXPECT_CALL(*gl, Uniform1iv(info.real_location, info.size, _))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| break;
|
| + case GL_UNSIGNED_INT:
|
| + EXPECT_CALL(*gl, Uniform1uiv(info.real_location, info.size, _))
|
| + .Times(1)
|
| + .RetiresOnSaturation();
|
| + break;
|
| case GL_INT_VEC2:
|
| case GL_BOOL_VEC2:
|
| EXPECT_CALL(*gl, Uniform2iv(info.real_location, info.size, _))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| break;
|
| + case GL_UNSIGNED_INT_VEC2:
|
| + EXPECT_CALL(*gl, Uniform2uiv(info.real_location, info.size, _))
|
| + .Times(1)
|
| + .RetiresOnSaturation();
|
| + break;
|
| case GL_INT_VEC3:
|
| case GL_BOOL_VEC3:
|
| EXPECT_CALL(*gl, Uniform3iv(info.real_location, info.size, _))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| break;
|
| + case GL_UNSIGNED_INT_VEC3:
|
| + EXPECT_CALL(*gl, Uniform3uiv(info.real_location, info.size, _))
|
| + .Times(1)
|
| + .RetiresOnSaturation();
|
| + break;
|
| case GL_INT_VEC4:
|
| case GL_BOOL_VEC4:
|
| EXPECT_CALL(*gl, Uniform4iv(info.real_location, info.size, _))
|
| .Times(1)
|
| .RetiresOnSaturation();
|
| break;
|
| + case GL_UNSIGNED_INT_VEC4:
|
| + EXPECT_CALL(*gl, Uniform4uiv(info.real_location, info.size, _))
|
| + .Times(1)
|
| + .RetiresOnSaturation();
|
| + break;
|
| case GL_FLOAT_MAT2:
|
| EXPECT_CALL(*gl, UniformMatrix2fv(
|
| info.real_location, info.size, false, _))
|
|
|