Revert of command_buffer_gles2: Implement EGL default Display as a global object

Revert of command_buffer_gles2: Implement EGL default Display as a global object (patchset #18 id:340001 of https://codereview.chromium.org/1714883002/ )

Reason for revert:
Failing in pfq-informational builders, e.g.:

https://uberchromegw.corp.google.com/i/chromeos.chrome/builders/tricky-tot-chrome-pfq-informational/builds/437

Details posted to original CL.


Original issue's description:
> command_buffer_gles2: Implement EGL default Display as a global object
> 
> Make EGL Display a global. eglGetDisplay(EGL_DEFAULT_DISPLAY) will
> return the same object.
> 
> Store EGL state in a new thread-local object (ThreadState). One
> display, multiple surfaces, multiple contexts.
> 
> Fix the currently implemented entry points to return specified errors
> and behave as specified. Notable changes:
> * eglGetDisplay() does not create new displays for each invocation
> * eglTerminate() invalidates the created egl objects but leaves the
>   current context intact as specified
> * eglMakeCurrent() is implemented more correctly with refcount semantics
> * eglQueryStrings() works without display for some names
> * eglReleaseThread() is implemeted
> * Config are now separate for pbuffers and windows, so that contexts
>   can be created separate from surfaces
> * Context can be made current with different surfaces
> * Catches errors related to context being set current to multiple
>   threads
> * Tries to be thread-safe
> 
> In the implementation, the Display contains a lock ensuring all thread
> accesses are consistent. All functions using or changing thread-local
> state have explicit egl::ThreadState parameter.
> 
> BUG=581634
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
> 
> Committed: https://crrev.com/de9aa3be41bca094454babbd62907815fad7f5c2
> Cr-Commit-Position: refs/heads/master@{#377535}
> 
> Committed: https://crrev.com/7b01a0867be0895009b120f37fcd4166a84f404b
> Cr-Commit-Position: refs/heads/master@{#386613}
> 
> Committed: https://crrev.com/f9d5c7e6fd53570c0decc63e8ec51d30e0701c89
> Cr-Commit-Position: refs/heads/master@{#387871}

TBR=piman@chromium.org,thakis@chromium.org,vabr@chromium.org,kkinnunen@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=581634

[stevenjb, 2016-04-18 16:27:53]

Created Revert of command_buffer_gles2: Implement EGL default Display as a
global object

[commit-bot: I haz the power, 2016-04-18 16:28:18]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1900703002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1900703002/1

[commit-bot: I haz the power, 2016-04-18 16:28:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-18 16:28:48]

Failed to apply patch for gpu/gles2_conform_support/egl/display.cc:
While running git apply --index -3 -p1;
  error: patch failed: gpu/gles2_conform_support/egl/display.cc:4
  Falling back to three-way merge...
  Applied patch to 'gpu/gles2_conform_support/egl/display.cc' with conflicts.
  U gpu/gles2_conform_support/egl/display.cc

Patch:       gpu/gles2_conform_support/egl/display.cc
Index: gpu/gles2_conform_support/egl/display.cc
diff --git a/gpu/gles2_conform_support/egl/display.cc
b/gpu/gles2_conform_support/egl/display.cc
index
2053f7da5091ec1f7ef03313a4c403f1e392225a..a19718b4c35e8c5a0030314a4d2a6e6eeac3d857
100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -4,114 +4,133 @@
 
 #include "gpu/gles2_conform_support/egl/display.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include <vector>
+#include "base/at_exit.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/lazy_instance.h"
+#include "gpu/command_buffer/client/gles2_implementation.h"
+#include "gpu/command_buffer/client/gles2_lib.h"
+#include "gpu/command_buffer/client/transfer_buffer.h"
+#include "gpu/command_buffer/common/value_state.h"
+#include "gpu/command_buffer/service/context_group.h"
+#include "gpu/command_buffer/service/mailbox_manager.h"
+#include "gpu/command_buffer/service/memory_tracking.h"
+#include "gpu/command_buffer/service/transfer_buffer_manager.h"
+#include "gpu/command_buffer/service/valuebuffer_manager.h"
 #include "gpu/gles2_conform_support/egl/config.h"
-#include "gpu/gles2_conform_support/egl/context.h"
 #include "gpu/gles2_conform_support/egl/surface.h"
-#include "gpu/gles2_conform_support/egl/thread_state.h"
+#include "gpu/gles2_conform_support/egl/test_support.h"
+
+namespace {
+const int32_t kCommandBufferSize = 1024 * 1024;
+const int32_t kTransferBufferSize = 512 * 1024;
+}
 
 namespace egl {
-
-Display::Display()
-    : is_initialized_(false),
-      next_create_window_surface_creates_pbuffer_(false),
-      window_surface_pbuffer_width_(0),
-      window_surface_pbuffer_height_(0) {}
+#if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY)
+// egl::Display is used for comformance tests and command_buffer_gles.  We only
+// need the exit manager for the command_buffer_gles library.
+// TODO(hendrikw): Find a cleaner solution for this.
+namespace {
+base::LazyInstance<base::Lock>::Leaky g_exit_manager_lock;
+int g_exit_manager_use_count;
+base::AtExitManager* g_exit_manager;
+void RefAtExitManager() {
+  base::AutoLock lock(g_exit_manager_lock.Get());
+#if defined(COMPONENT_BUILD)
+  if (g_command_buffer_gles_has_atexit_manager) {
+    return;
+  }
+#endif
+  if (g_exit_manager_use_count == 0) {
+    g_exit_manager = new base::AtExitManager;
+  }
+  ++g_exit_manager_use_count;
+}
+void ReleaseAtExitManager() {
+  base::AutoLock lock(g_exit_manager_lock.Get());
+#if defined(COMPONENT_BUILD)
+  if (g_command_buffer_gles_has_atexit_manager) {
+    return;
+  }
+#endif
+  --g_exit_manager_use_count;
+  if (g_exit_manager_use_count == 0) {
+    delete g_exit_manager;
+    g_exit_manager = nullptr;
+  }
+}
+}
+#endif
+
+Display::Display(EGLNativeDisplayType display_id)
+    : display_id_(display_id),
+      is_initialized_(false),
+      create_offscreen_(false),
+      create_offscreen_width_(0),
+      create_offscreen_height_(0),
+      next_fence_sync_release_(1) {
+#if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY)
+  RefAtExitManager();
+#endif
+}
 
 Display::~Display() {
-  surfaces_.clear();
-  contexts_.clear();
-}
-void Display::SetNextCreateWindowSurfaceCreatesPBuffer(EGLint width,
-                                                       EGLint height) {
-  next_create_window_surface_creates_pbuffer_ = true;
-  window_surface_pbuffer_width_ = width;
-  window_surface_pbuffer_height_ = height;
-}
-
-EGLBoolean Display::Initialize(ThreadState* ts, EGLint* major, EGLint* minor) {
-  base::AutoLock auto_lock(lock_);
+  gles2::Terminate();
+#if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY)
+  ReleaseAtExitManager();
+#endif
+}
+
+bool Display::Initialize() {
+  gles2::Initialize();
   is_initialized_ = true;
-
-  if (major)
-    *major = 1;
-  if (minor)
-    *minor = 4;
-  return ts->ReturnSuccess(EGL_TRUE);
-}
-
-EGLBoolean Display::Terminate(ThreadState* ts) {
-  base::AutoLock auto_lock(lock_);
-  is_initialized_ = false;
-  surfaces_.clear();
-  for (const auto& context : contexts_)
-    context->MarkDestroyed();
-  contexts_.clear();
-  return ts->ReturnSuccess(EGL_TRUE);
-}
-
-const char* Display::QueryString(ThreadState* ts, EGLint name) {
-  base::AutoLock auto_lock(lock_);
-  if (!is_initialized_)
-    return ts->ReturnError<const char*>(EGL_NOT_INITIALIZED, nullptr);
-  switch (name) {
-    case EGL_CLIENT_APIS:
-      return ts->ReturnSuccess("OpenGL_ES");
-    case EGL_EXTENSIONS:
-      return ts->ReturnSuccess("");
-    case EGL_VENDOR:
-      return ts->ReturnSuccess("Google Inc.");
-    case EGL_VERSION:
-      return ts->ReturnSuccess("1.4");
-    default:
-      return ts->ReturnError<const char*>(EGL_BAD_PARAMETER, nullptr);
-  }
-}
-
-EGLBoolean Display::ChooseConfig(ThreadState* ts,
-                                 const EGLint* attrib_list,
-                                 EGLConfig* configs,
-                                 EGLint config_size,
-                                 EGLint* num_config) {
-  base::AutoLock auto_lock(lock_);
-  if (!is_initialized_)
-    return ts->ReturnError(EGL_NOT_INITIALIZED, EGL_FALSE);
-  if (num_config == nullptr)
-    return ts->ReturnError(EGL_BAD_PARAMETER, EGL_FALSE);
-  if (!Config::ValidateAttributeList(attrib_list))
-    return ts->ReturnError(EGL_BAD_ATTRIBUTE, EGL_FALSE);
-  InitializeConfigsIfNeeded();
-  if (!configs)
-    config_size = 0;
-  *num_config = 0;
-  for (size_t i = 0; i < arraysize(configs_); ++i) {
-    if (configs_[i]->Matches(attrib_list)) {
-      if (*num_config < config_size) {
-        configs[*num_config] = configs_[i].get();
-      }
-      ++*num_config;
+  return true;
+}
+
+bool Display::IsValidConfig(EGLConfig config) {
+  return (config != NULL) && (config == config_.get());
+}
+
+bool Display::ChooseConfigs(EGLConfig* configs,
+                            EGLint config_size,
+                            EGLint* num_config) {
+  // TODO(alokp): Find out a way to find all configs. CommandBuffer currently
+  // does not support finding or choosing configs.
+  *num_config = 1;
+  if (configs != NULL) {
+    if (config_ == NULL) {
+      config_.reset(new Config);
     }
-  }
-  return ts->ReturnSuccess(EGL_TRUE);
-}
-
-EGLBoolean Display::GetConfigs(ThreadState* ts,
-                               EGLConfig* configs,
-                               EGLint config_size,
-                               EGLint* num_config) {
-  base::AutoLock auto_lock(lock_);
-  if (!is_initialized_)
-    return ts->ReturnError(EGL_NOT_INITIALIZED, EGL_FALSE);
-  if (num_config == nullptr)
-    return ts->ReturnError(EGL_BAD_PARAMETER, EGL_FALSE);
-  InitializeConfigsIfNeeded();
-  if (!configs)
-    config_size = 0;
-  *num_config = arraysize(configs_);
-  size_t count =
-      std::min(arraysize(configs_), static_cast<size_t>(config_size));
-  for (size_t i = 0; i < count; ++i)
-    configs[i] = configs_[i].get();
-  return ts->ReturnSuccess(EGL_TRUE);
+    configs[0] = config_.get();
+  }
+  return true;
+}
+
+bool Display::GetConfigs(EGLConfig* configs,
+                         EGLint config_size,
+                         EGLint* num_config) {
+  // TODO(alokp): Find out a way to find all configs. CommandBuffer currently
+  // does not support finding or choosing configs.
+  *num_config = 1;
+  if (configs != NULL) {
+    if (config_ == NULL) {
+      config_.reset(new Config);
+    }
+    configs[0] = config_.get();
+  }
+  return true;
+}
+
+bool Display::GetConfigAttrib(EGLConfig config,
+                              EGLint attribute,
+                              EGLint* value) {
+  const egl::Config* cfg = static_cast<egl::Config*>(config);
+  return cfg->GetAttrib(attribute, value);
 }
 
 bool Display::IsValidNativeWindow(EGLNativeWindowType win) {
@@ -123,229 +142,248 @@
 #endif  // OS_WIN
 }
 
-EGLBoolean Display::GetConfigAttrib(ThreadState* ts,
-                                    EGLConfig cfg,
-                                    EGLint attribute,
-                                    EGLint* value) {
-  base::AutoLock auto_lock(lock_);
-  if (!is_initialized_)
-    return ts->ReturnError(EGL_NOT_INITIALIZED, EGL_FALSE);
-  const egl::Config* config = GetConfig(cfg);
-  if (!config)
-    return ts->ReturnError(EGL_BAD_CONFIG, EGL_FALSE);
-  if (!config->GetAttrib(attribute, value))
-    return ts->ReturnError(EGL_BAD_ATTRIBUTE, EGL_FALSE);
-  return ts->ReturnSuccess(EGL_TRUE);
-}
-
-EGLSurface Display::CreatePbufferSurface(ThreadState* ts,
-                                         EGLConfig cfg,
-                                         const EGLint* attrib_list) {
-  base::AutoLock auto_lock(lock_);
-  if (!is_initialized_)
-    return ts->ReturnError(EGL_NOT_INITIALIZED, EGL_NO_SURFACE);
-  const egl::Config* config = GetConfig(cfg);
-  if (!config)
-    return ts->ReturnError(EGL_BAD_CONFIG, EGL_NO_SURFACE);
-  EGLint value = EGL_NONE;
-  config->GetAttrib(EGL_SURFACE_TYPE, &value);
-  if ((value & EGL_PBUFFER_BIT) == 0)
-    return ts->ReturnError(EGL_BAD_MATCH, EGL_NO_SURFACE);
-  if (!egl::Surface::ValidatePbufferAttributeList(attrib_list))
-    return ts->ReturnError(EGL_BAD_ATTRIBUTE, EGL_NO_SURFACE);
-
-  int width = 1;
-  int height = 1;
-  if (attrib_list) {
-    for (const int32_t* attr = attrib_list; attr[0] != EGL_NONE; attr += 2) {
-      switch (attr[0]) {
-        case EGL_WIDTH:
-          width = attr[1];
-          break;
-        case EGL_HEIGHT:
-          height = attr[1];
-          break;
-      }
-    }
-  }
-  return DoCreatePbufferSurface(ts, width, height);
-}
-
-EGLSurface Display::DoCreatePbufferSurf…
(message too large)

[commit-bot: I haz the power, 2016-04-18 16:28:56]

The CQ bit was unchecked by commit-bot@chromium.org

[Nico, 2016-04-18 16:30:07]

revert message could be improved; many people can't access uberchromegw links

[stevenjb, 2016-04-18 18:34:35]

Description was changed from

==========
Revert of command_buffer_gles2: Implement EGL default Display as a global object
(patchset #18 id:340001 of https://codereview.chromium.org/1714883002/ )

Reason for revert:
Failing in pfq-informational builders, e.g.:

https://uberchromegw.corp.google.com/i/chromeos.chrome/builders/tricky-tot-ch...


Original issue's description:
> command_buffer_gles2: Implement EGL default Display as a global object
> 
> Make EGL Display a global. eglGetDisplay(EGL_DEFAULT_DISPLAY) will
> return the same object.
> 
> Store EGL state in a new thread-local object (ThreadState). One
> display, multiple surfaces, multiple contexts.
> 
> Fix the currently implemented entry points to return specified errors
> and behave as specified. Notable changes:
> * eglGetDisplay() does not create new displays for each invocation
> * eglTerminate() invalidates the created egl objects but leaves the
>   current context intact as specified
> * eglMakeCurrent() is implemented more correctly with refcount semantics
> * eglQueryStrings() works without display for some names
> * eglReleaseThread() is implemeted
> * Config are now separate for pbuffers and windows, so that contexts
>   can be created separate from surfaces
> * Context can be made current with different surfaces
> * Catches errors related to context being set current to multiple
>   threads
> * Tries to be thread-safe
> 
> In the implementation, the Display contains a lock ensuring all thread
> accesses are consistent. All functions using or changing thread-local
> state have explicit egl::ThreadState parameter.
> 
> BUG=581634
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
> 
> Committed: https://crrev.com/de9aa3be41bca094454babbd62907815fad7f5c2
> Cr-Commit-Position: refs/heads/master@{#377535}
> 
> Committed: https://crrev.com/7b01a0867be0895009b120f37fcd4166a84f404b
> Cr-Commit-Position: refs/heads/master@{#386613}
> 
> Committed: https://crrev.com/f9d5c7e6fd53570c0decc63e8ec51d30e0701c89
> Cr-Commit-Position: refs/heads/master@{#387871}

TBR=piman@chromium.org,thakis@chromium.org,vabr@chromium.org,kkinnunen@nvidia...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=581634
==========

to

==========
Revert of command_buffer_gles2: Implement EGL default Display as a global object
(patchset #18 id:340001 of https://codereview.chromium.org/1714883002/ )

Reason for revert:
Failing in pfq-informational builders, e.g.:

https://uberchromegw.corp.google.com/i/chromeos.chrome/builders/tricky-tot-ch...

Details posted to original CL.


Original issue's description:
> command_buffer_gles2: Implement EGL default Display as a global object
> 
> Make EGL Display a global. eglGetDisplay(EGL_DEFAULT_DISPLAY) will
> return the same object.
> 
> Store EGL state in a new thread-local object (ThreadState). One
> display, multiple surfaces, multiple contexts.
> 
> Fix the currently implemented entry points to return specified errors
> and behave as specified. Notable changes:
> * eglGetDisplay() does not create new displays for each invocation
> * eglTerminate() invalidates the created egl objects but leaves the
>   current context intact as specified
> * eglMakeCurrent() is implemented more correctly with refcount semantics
> * eglQueryStrings() works without display for some names
> * eglReleaseThread() is implemeted
> * Config are now separate for pbuffers and windows, so that contexts
>   can be created separate from surfaces
> * Context can be made current with different surfaces
> * Catches errors related to context being set current to multiple
>   threads
> * Tries to be thread-safe
> 
> In the implementation, the Display contains a lock ensuring all thread
> accesses are consistent. All functions using or changing thread-local
> state have explicit egl::ThreadState parameter.
> 
> BUG=581634
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
> 
> Committed: https://crrev.com/de9aa3be41bca094454babbd62907815fad7f5c2
> Cr-Commit-Position: refs/heads/master@{#377535}
> 
> Committed: https://crrev.com/7b01a0867be0895009b120f37fcd4166a84f404b
> Cr-Commit-Position: refs/heads/master@{#386613}
> 
> Committed: https://crrev.com/f9d5c7e6fd53570c0decc63e8ec51d30e0701c89
> Cr-Commit-Position: refs/heads/master@{#387871}

TBR=piman@chromium.org,thakis@chromium.org,vabr@chromium.org,kkinnunen@nvidia...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=581634
==========

[stevenjb, 2016-04-18 18:36:04]

I pasted a detailed failure snippet on the original CL.

[stevenjb, 2016-04-18 18:36:10]

The CQ bit was checked by stevenjb@chromium.org

[commit-bot: I haz the power, 2016-04-18 18:36:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1900703002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1900703002/1

[commit-bot: I haz the power, 2016-04-18 18:37:04]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-04-18 18:37:06]

Failed to apply patch for gpu/command_buffer/service/gles2_cmd_decoder.cc:
While running git apply --index -3 -p1;
  error: patch failed: gpu/command_buffer/service/gles2_cmd_decoder.cc:594
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: gpu/command_buffer/service/gles2_cmd_decoder.cc: patch does not apply

Patch:       gpu/command_buffer/service/gles2_cmd_decoder.cc
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
81fac47832da5c8989b2a1fd5d0b2822bec76354..767a7ca75f8e5306bedcff7f8eb66dd74f1a6642
100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -594,7 +594,6 @@
                   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();
@@ -3707,7 +3706,6 @@
 // }  // anonymous namespace
 
 bool GLES2DecoderImpl::MakeCurrent() {
-  DCHECK(surface_);
   if (!context_.get())
     return false;
 
@@ -4265,20 +4263,9 @@
 void GLES2DecoderImpl::SetSurface(
     const scoped_refptr<gfx::GLSurface>& surface) {
   DCHECK(context_->IsCurrent(NULL));
-  DCHECK(surface);
+  DCHECK(surface_.get());
   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) {

[stevenjb, 2016-04-18 18:43:10]

Already reverted here:
https://codereview.chromium.org/1895153002/