Implement our own GLThread for VR Shell.

chrome/browser/android/vr_shell/vr_shell_gl.h

Index: chrome/browser/android/vr_shell/vr_shell_gl.h
diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.h b/chrome/browser/android/vr_shell/vr_shell_gl.h
new file mode 100644
index 0000000000000000000000000000000000000000..55ee46e25b0e48628ac0927b13f791f067dce131
--- /dev/null
+++ b/chrome/browser/android/vr_shell/vr_shell_gl.h
@@ -0,0 +1,183 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
+#define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_

[cjgrant, 2016/12/08 17:02:49]

Should vr_gl_util's contents move into these new files, or do you prefer them
separate?

[mthiesse, 2016/12/09 01:28:42]

No preference. Feel free to move address this in a followup CL.

+
+#include <memory>
+
+#include "base/cancelable_callback.h"
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
+#include "device/vr/android/gvr/gvr_delegate.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
+#include "ui/gfx/native_widget_types.h"
+
+namespace blink {
+class WebInputEvent;
+}
+
+namespace gl {
+class GLContext;
+class GLSurface;
+class ScopedJavaSurface;
+class SurfaceTexture;
+}
+
+namespace vr_shell {
+
+class UiScene;
+class VrController;
+class VrInputManager;
+class VrShell;
+class VrShellRenderer;
+struct ContentRectangle;
+
+class VrShellGl {
+ public:
+  VrShellGl(
+      VrShell* vr_shell,
+      base::WeakPtr<VrShell> weak_vr_shell,
+      base::WeakPtr<VrInputManager> content_input_manager,
+      base::WeakPtr<VrInputManager> ui_input_manager,
+      scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
+      gvr_context* gvr_api);
+  ~VrShellGl();
+
+  enum InputTarget {
+    NONE = 0,
+    CONTENT,
+    UI
+  };
+  void DrawFrame();
+
+  void OnTriggerEvent();
+  void OnPause();
+  void OnResume();
+
+  void SetWebVrMode(bool enabled);
+  void ContentBoundsChanged(int width, int height);
+  void ContentPhysicalBoundsChanged(int width, int height);
+  void UIBoundsChanged(int width, int height);
+  void UIPhysicalBoundsChanged(int width, int height);
+  base::WeakPtr<VrShellGl> GetWeakPtr();
+
+  void UpdateWebVRTextureBounds(const gvr::Rectf& left_bounds,
+                                const gvr::Rectf& right_bounds);
+  gvr::GvrApi* gvr_api();
+  void SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num);
+  void SetWebVRRenderSurfaceSize(int width, int height);
+  gvr::Sizei GetWebVRCompositorSurfaceSize();
+
+  UiScene* GetScene() { return scene_.get(); }
+
+ private:
+  void InitializeGl();
+  void GvrInit(gvr_context* gvr_api);
+  void InitializeRenderer();
+  void DrawVrShell(const gvr::Mat4f& head_pose, gvr::Frame &frame);
+  void DrawUiView(const gvr::Mat4f* head_pose,
+                  const std::vector<const ContentRectangle*>& elements,
+                  const gvr::Sizei& render_size, int viewport_offset);
+  void DrawElements(const gvr::Mat4f& render_matrix,
+                    const std::vector<const ContentRectangle*>& elements);
+  void DrawCursor(const gvr::Mat4f& render_matrix);
+  void DrawWebVr();
+  bool WebVrPoseByteIsValid(int pose_index_byte);
+
+  void UpdateController(const gvr::Vec3f& forward_vector);
+  void SendEventsToTarget(InputTarget input_target, int pixel_x,
+                          int pixel_y);
+  void SendGesture(InputTarget input_target,
+                   std::unique_ptr<blink::WebInputEvent> event);
+
+  void OnUIFrameAvailable();
+  void OnContentFrameAvailable();
+
+  void UpdateVSyncParameters(const base::TimeTicks timebase,
+                             const base::TimeDelta interval);
+  void ScheduleNextDrawFrame();
+
+  // samplerExternalOES texture data for UI content image.
+  int ui_texture_id_ = 0;
+  // samplerExternalOES texture data for main content image.
+  int content_texture_id_ = 0;
+
+  std::unique_ptr<UiScene> scene_;
+
+  scoped_refptr<gl::GLSurface> surface_;
+  scoped_refptr<gl::GLContext> context_;
+  scoped_refptr<gl::SurfaceTexture> ui_surface_texture_;
+  scoped_refptr<gl::SurfaceTexture> content_surface_texture_;
+
+  std::unique_ptr<gl::ScopedJavaSurface> ui_surface_;
+  std::unique_ptr<gl::ScopedJavaSurface> content_surface_;
+
+  std::unique_ptr<gvr::GvrApi> gvr_api_;
+  std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_;
+  std::unique_ptr<gvr::BufferViewport> buffer_viewport_;
+  std::unique_ptr<gvr::BufferViewport> headlocked_left_viewport_;
+  std::unique_ptr<gvr::BufferViewport> headlocked_right_viewport_;
+  std::unique_ptr<gvr::BufferViewport> webvr_left_viewport_;
+  std::unique_ptr<gvr::BufferViewport> webvr_right_viewport_;
+  std::unique_ptr<gvr::SwapChain> swap_chain_;
+
+  // Current sizes for the render buffers.
+  gvr::Sizei render_size_primary_;
+  gvr::Sizei render_size_headlocked_;
+
+  // Intended size for the primary render buffer by UI mode.
+  // For WebVR, a size of 0x0 is used to indicate "not yet ready"
+  // to suppress rendering while still initializing.
+  gvr::Sizei render_size_primary_webvr_ = device::kInvalidRenderTargetSize;
+  gvr::Sizei render_size_primary_vrshell_;
+
+  std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
+
+  bool touch_pending_ = false;
+  gvr::Quatf controller_quat_;
+
+  gvr::Vec3f target_point_;
+  const ContentRectangle* target_element_ = nullptr;
+  InputTarget current_input_target_ = NONE;
+  int ui_tex_css_width_ = 0;
+  int ui_tex_css_height_ = 0;
+  int content_tex_css_width_ = 0;
+  int content_tex_css_height_ = 0;
+  gvr::Sizei content_tex_physical_size_ = {0, 0};
+  gvr::Sizei ui_tex_physical_size_ = {0, 0};
+
+  // The pose ring buffer size must be a power of two to avoid glitches when
+  // the pose index wraps around. It should be large enough to handle the
+  // current backlog of poses which is 2-3 frames.
+  static constexpr int kPoseRingBufferSize = 8;
+  std::vector<gvr::Mat4f> webvr_head_pose_;
+  std::vector<bool> webvr_head_pose_valid_;
+  jint webvr_texture_id_ = 0;
+
+  std::unique_ptr<VrController> controller_;
+
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+  base::CancelableClosure draw_task_;
+  base::TimeTicks vsync_timebase_;
+  base::TimeDelta vsync_interval_;
+
+  // TODO(mthiesse): Remove thread-unsafe VrShell usage.
+  VrShell* vr_shell_;
+  base::WeakPtr<VrShell> weak_vr_shell_;
+  base::WeakPtr<VrInputManager> content_input_manager_;
+  base::WeakPtr<VrInputManager> ui_input_manager_;
+  scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
+
+  base::WeakPtrFactory<VrShellGl> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(VrShellGl);
+};
+
+}  // namespace vr_shell
+
+#endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_