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

Side by Side Diff: gpu/command_buffer/tests/gl_virtual_contexts_unittest.cc

Issue 1186393004: gpu: Remove async texture uploads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 unified diff | Download patch
« no previous file with comments | « gpu/command_buffer/service/texture_manager.h ('k') | gpu/command_buffer_service.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <GLES2/gl2.h> 5 #include <GLES2/gl2.h>
6 #include <GLES2/gl2ext.h> 6 #include <GLES2/gl2ext.h>
7 #include <GLES2/gl2extchromium.h> 7 #include <GLES2/gl2extchromium.h>
8 8
9 #include "gpu/command_buffer/tests/gl_manager.h" 9 #include "gpu/command_buffer/tests/gl_manager.h"
10 #include "gpu/command_buffer/tests/gl_test_utils.h" 10 #include "gpu/command_buffer/tests/gl_test_utils.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 GLTestHelper::CheckPixels(0, 0, kSize2, kSize2, 0, kExpectedGreen)); 297 GLTestHelper::CheckPixels(0, 0, kSize2, kSize2, 0, kExpectedGreen));
298 glFinish(); 298 glFinish();
299 299
300 GLTestHelper::CheckGLError("no errors", __LINE__); 300 GLTestHelper::CheckGLError("no errors", __LINE__);
301 } 301 }
302 302
303 TEST_F(GLVirtualContextsTest, VirtualQueries) { 303 TEST_F(GLVirtualContextsTest, VirtualQueries) {
304 const GLenum query_targets[] = { 304 const GLenum query_targets[] = {
305 GL_ANY_SAMPLES_PASSED_EXT, 305 GL_ANY_SAMPLES_PASSED_EXT,
306 GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT, 306 GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT,
307 // TODO(dyen): (http://crbug.com/514124) Figure out a way to test this,
308 // the function AsyncPixelTransferManagerEGL::AsyncNotifyCompletion
309 // completes asynchronously.
310 // GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM,
311 GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM, 307 GL_ASYNC_PIXEL_PACK_COMPLETED_CHROMIUM,
312 GL_COMMANDS_COMPLETED_CHROMIUM, 308 GL_COMMANDS_COMPLETED_CHROMIUM,
313 GL_COMMANDS_ISSUED_CHROMIUM, 309 GL_COMMANDS_ISSUED_CHROMIUM,
314 GL_GET_ERROR_QUERY_CHROMIUM, 310 GL_GET_ERROR_QUERY_CHROMIUM,
315 GL_LATENCY_QUERY_CHROMIUM, 311 GL_LATENCY_QUERY_CHROMIUM,
316 GL_TIME_ELAPSED_EXT, 312 GL_TIME_ELAPSED_EXT,
317 }; 313 };
318 314
319 for (GLenum query_target : query_targets) { 315 for (GLenum query_target : query_targets) {
320 GLuint query1 = 0; 316 GLuint query1 = 0;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 &query2_available); 353 &query2_available);
358 EXPECT_TRUE(query2_available); 354 EXPECT_TRUE(query2_available);
359 355
360 glDeleteQueriesEXT(1, &query2); 356 glDeleteQueriesEXT(1, &query2);
361 GLTestHelper::CheckGLError("no errors", __LINE__); 357 GLTestHelper::CheckGLError("no errors", __LINE__);
362 } 358 }
363 } 359 }
364 360
365 } // namespace gpu 361 } // namespace gpu
366 362
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/texture_manager.h ('k') | gpu/command_buffer_service.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698