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

Unified Diff: gpu/command_buffer/tests/gl_consistent_uniform_locations_unittest.cc

Issue 10581029: Make GL_CHROMIUM_consistent_uniform_locations slighty more robust (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
Index: gpu/command_buffer/tests/gl_consistent_uniform_locations_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_consistent_uniform_locations_unittest.cc b/gpu/command_buffer/tests/gl_consistent_uniform_locations_unittest.cc
index b8313682467389d0fb6bb44a13bc02068860ac34..e5f7dc303106e051e596c68145f87a0f2266ae1a 100644
--- a/gpu/command_buffer/tests/gl_consistent_uniform_locations_unittest.cc
+++ b/gpu/command_buffer/tests/gl_consistent_uniform_locations_unittest.cc
@@ -65,18 +65,18 @@ TEST_F(ConsistenUniformLocationsTest, Basic) {
{ GL_FLOAT_VEC4, 1, "u_colorA", },
};
+ GLuint program = GLTestHelper::LoadProgram(v_shader_str, f_shader_str);
+
GLint locations[4];
glGetUniformLocationsCHROMIUM(
- defs, arraysize(defs), arraysize(locations), locations);
+ program, defs, arraysize(defs), arraysize(locations), locations);
GLint u_colorCLocation = locations[0];
GLint u_colorB0Location = locations[1];
GLint u_colorB1Location = locations[2];
GLint u_colorALocation = locations[3];
- GLuint program = GLTestHelper::LoadProgram(v_shader_str, f_shader_str);
-
GLint position_loc = glGetAttribLocation(program, "a_position");
GLTestHelper::SetupUnitQuad(position_loc);
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h ('k') | third_party/khronos/GLES2/gl2ext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698