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

Side by Side Diff: gpu/gles2_conform_support/egl/display.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/gles2_conform_support/egl/display.h ('k') | gpu/ipc/client/command_buffer_proxy_impl.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/gles2_conform_support/egl/display.h" 5 #include "gpu/gles2_conform_support/egl/display.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <vector> 10 #include <vector>
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 } else { 315 } else {
316 DCHECK(IsValidSurface(draw)); 316 DCHECK(IsValidSurface(draw));
317 DCHECK(IsValidSurface(read)); 317 DCHECK(IsValidSurface(read));
318 DCHECK(IsValidContext(ctx)); 318 DCHECK(IsValidContext(ctx));
319 gles2::SetGLContext(context_.get()); 319 gles2::SetGLContext(context_.get());
320 gl_context_->MakeCurrent(gl_surface_.get()); 320 gl_context_->MakeCurrent(gl_surface_.get());
321 } 321 }
322 return true; 322 return true;
323 } 323 }
324 324
325 void Display::SetGpuControlClient(gpu::GpuControlClient*) {
326 // The client is not currently called, so don't store it.
327 }
328
329 gpu::Capabilities Display::GetCapabilities() { 325 gpu::Capabilities Display::GetCapabilities() {
330 return decoder_->GetCapabilities(); 326 return decoder_->GetCapabilities();
331 } 327 }
332 328
333 int32_t Display::CreateImage(ClientBuffer buffer, 329 int32_t Display::CreateImage(ClientBuffer buffer,
334 size_t width, 330 size_t width,
335 size_t height, 331 size_t height,
336 unsigned internalformat) { 332 unsigned internalformat) {
337 NOTIMPLEMENTED(); 333 NOTIMPLEMENTED();
338 return -1; 334 return -1;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 void Display::SignalSyncToken(const gpu::SyncToken& sync_token, 394 void Display::SignalSyncToken(const gpu::SyncToken& sync_token,
399 const base::Closure& callback) { 395 const base::Closure& callback) {
400 NOTIMPLEMENTED(); 396 NOTIMPLEMENTED();
401 } 397 }
402 398
403 bool Display::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) { 399 bool Display::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) {
404 return false; 400 return false;
405 } 401 }
406 402
407 } // namespace egl 403 } // namespace egl
OLDNEW
« no previous file with comments | « gpu/gles2_conform_support/egl/display.h ('k') | gpu/ipc/client/command_buffer_proxy_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698