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

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

Issue 1714883002: command_buffer_gles2: Implement EGL default Display as a global object (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@command_buffer_gles2-multiple-contexts
Patch Set: workaround gtf Created 4 years, 10 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/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 52118fb73103847f9c600b57d56b38f3c1894a02..534a6bba4d034af2646fda39641e1b1bfce107b7 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -577,6 +577,7 @@ class GLES2DecoderImpl : public GLES2Decoder, public ErrorStateClient {
const std::vector<int32_t>& attribs) override;
void Destroy(bool have_context) override;
void SetSurface(const scoped_refptr<gfx::GLSurface>& surface) override;
+ void ReleaseSurface() override;
void ProduceFrontBuffer(const Mailbox& mailbox) override;
bool ResizeOffscreenFrameBuffer(const gfx::Size& size) override;
void UpdateParentTextureInfo();
@@ -3599,6 +3600,7 @@ void GLES2DecoderImpl::DeleteSamplersHelper(
// } // anonymous namespace
bool GLES2DecoderImpl::MakeCurrent() {
+ DCHECK(surface_);
if (!context_.get())
return false;
@@ -4156,11 +4158,22 @@ void GLES2DecoderImpl::Destroy(bool have_context) {
void GLES2DecoderImpl::SetSurface(
const scoped_refptr<gfx::GLSurface>& surface) {
DCHECK(context_->IsCurrent(NULL));
- DCHECK(surface_.get());
+ DCHECK(surface);
surface_ = surface;
RestoreCurrentFramebufferBindings();
}
+void GLES2DecoderImpl::ReleaseSurface() {
+ if (!context_.get())
+ return;
+ if (WasContextLost()) {
+ DLOG(ERROR) << " GLES2DecoderImpl: Trying to release lost context.";
+ return;
+ }
+ context_->ReleaseCurrent(surface_.get());
+ surface_ = nullptr;
+}
+
void GLES2DecoderImpl::ProduceFrontBuffer(const Mailbox& mailbox) {
if (!offscreen_saved_color_texture_.get()) {
LOG(ERROR) << "Called ProduceFrontBuffer on a non-offscreen context";

Powered by Google App Engine
This is Rietveld 408576698