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

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

Issue 1081533003: ui: Enable virtual contexts for linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yet another merge Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/gl_context_virtual.h ('k') | gpu/config/gpu_driver_bug_list_json.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gl_context_virtual.cc
diff --git a/gpu/command_buffer/service/gl_context_virtual.cc b/gpu/command_buffer/service/gl_context_virtual.cc
index 0857a521787052d9eba3317cd21eab189f4baec0..3abcb137308c70494bedf0174f60f2373e0114fa 100644
--- a/gpu/command_buffer/service/gl_context_virtual.cc
+++ b/gpu/command_buffer/service/gl_context_virtual.cc
@@ -18,20 +18,13 @@ GLContextVirtual::GLContextVirtual(
base::WeakPtr<gles2::GLES2Decoder> decoder)
: GLContext(share_group),
shared_context_(shared_context),
- display_(NULL),
decoder_(decoder) {
}
-gfx::Display* GLContextVirtual::display() {
- return display_;
-}
-
bool GLContextVirtual::Initialize(
gfx::GLSurface* compatible_surface, gfx::GpuPreference gpu_preference) {
SetGLStateRestorer(new GLStateRestorerImpl(decoder_));
- display_ = static_cast<gfx::Display*>(compatible_surface->GetDisplay());
-
// Virtual contexts obviously can't make a context that is compatible
// with the surface (the context already exists), but we do need to
// make a context current for SetupForVirtualization() below.
@@ -52,7 +45,6 @@ bool GLContextVirtual::Initialize(
void GLContextVirtual::Destroy() {
shared_context_->OnReleaseVirtuallyCurrent(this);
shared_context_ = NULL;
- display_ = NULL;
}
bool GLContextVirtual::MakeCurrent(gfx::GLSurface* surface) {
« no previous file with comments | « gpu/command_buffer/service/gl_context_virtual.h ('k') | gpu/config/gpu_driver_bug_list_json.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698