Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: gpu/command_buffer/service/test_helper.cc

Issue 1335243002: Improve Uniform*ui{v} command handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/program_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, _))
« no previous file with comments | « gpu/command_buffer/service/program_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698