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

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

Issue 1885903002: Revert of Make lost context and error message callbacks on GpuControl go to client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/tests/gl_manager.h ('k') | gpu/gles2_conform_support/egl/display.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "gpu/command_buffer/tests/gl_manager.h" 5 #include "gpu/command_buffer/tests/gl_manager.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <GLES2/gl2.h>
8 #include <GLES2/gl2ext.h> 8 #include <GLES2/gl2ext.h>
9 #include <GLES2/gl2extchromium.h> 9 #include <GLES2/gl2extchromium.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 if (sync_point_manager_) { 504 if (sync_point_manager_) {
505 // Finish processing order number here. 505 // Finish processing order number here.
506 sync_point_order_data_->FinishProcessingOrderNumber(order_num); 506 sync_point_order_data_->FinishProcessingOrderNumber(order_num);
507 } 507 }
508 } 508 }
509 509
510 bool GLManager::GetBufferChanged(int32_t transfer_buffer_id) { 510 bool GLManager::GetBufferChanged(int32_t transfer_buffer_id) {
511 return executor_->SetGetBuffer(transfer_buffer_id); 511 return executor_->SetGetBuffer(transfer_buffer_id);
512 } 512 }
513 513
514 void GLManager::SetGpuControlClient(GpuControlClient*) {
515 // The client is not currently called, so don't store it.
516 }
517
518 Capabilities GLManager::GetCapabilities() { 514 Capabilities GLManager::GetCapabilities() {
519 return decoder_->GetCapabilities(); 515 return decoder_->GetCapabilities();
520 } 516 }
521 517
522 int32_t GLManager::CreateImage(ClientBuffer buffer, 518 int32_t GLManager::CreateImage(ClientBuffer buffer,
523 size_t width, 519 size_t width,
524 size_t height, 520 size_t height,
525 unsigned internalformat) { 521 unsigned internalformat) {
526 gfx::Size size(width, height); 522 gfx::Size size(width, height);
527 scoped_refptr<gl::GLImage> gl_image; 523 scoped_refptr<gl::GLImage> gl_image;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 634
639 // Something went wrong, just run the callback now. 635 // Something went wrong, just run the callback now.
640 callback.Run(); 636 callback.Run();
641 } 637 }
642 638
643 bool GLManager::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) { 639 bool GLManager::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) {
644 return false; 640 return false;
645 } 641 }
646 642
647 } // namespace gpu 643 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/tests/gl_manager.h ('k') | gpu/gles2_conform_support/egl/display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698