| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
| 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <queue> | 9 #include <queue> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 std::unique_ptr<gvr::BufferViewport> headlocked_right_viewport_; | 153 std::unique_ptr<gvr::BufferViewport> headlocked_right_viewport_; |
| 154 std::unique_ptr<gvr::BufferViewport> webvr_left_viewport_; | 154 std::unique_ptr<gvr::BufferViewport> webvr_left_viewport_; |
| 155 std::unique_ptr<gvr::BufferViewport> webvr_right_viewport_; | 155 std::unique_ptr<gvr::BufferViewport> webvr_right_viewport_; |
| 156 std::unique_ptr<gvr::SwapChain> swap_chain_; | 156 std::unique_ptr<gvr::SwapChain> swap_chain_; |
| 157 using BoundsPair = std::pair<gvr::Rectf, gvr::Rectf>; | 157 using BoundsPair = std::pair<gvr::Rectf, gvr::Rectf>; |
| 158 std::queue<std::pair<uint8_t, BoundsPair>> pending_bounds_; | 158 std::queue<std::pair<uint8_t, BoundsPair>> pending_bounds_; |
| 159 | 159 |
| 160 // Current sizes for the render buffers. | 160 // Current sizes for the render buffers. |
| 161 gvr::Sizei render_size_primary_; | 161 gvr::Sizei render_size_primary_; |
| 162 gvr::Sizei render_size_headlocked_; | 162 gvr::Sizei render_size_headlocked_; |
| 163 gvr::Sizei render_size_primary_vrshell_ = {0, 0}; |
| 164 gvr::Sizei render_size_primary_webvr_ = {0, 0}; |
| 163 | 165 |
| 164 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; | 166 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; |
| 165 | 167 |
| 166 bool touch_pending_ = false; | 168 bool touch_pending_ = false; |
| 167 gvr::Quatf controller_quat_; | 169 gvr::Quatf controller_quat_; |
| 168 | 170 |
| 169 gvr::Vec3f target_point_; | 171 gvr::Vec3f target_point_; |
| 170 const ContentRectangle* target_element_ = nullptr; | 172 const ContentRectangle* target_element_ = nullptr; |
| 171 InputTarget current_input_target_ = InputTarget::NONE; | 173 InputTarget current_input_target_ = InputTarget::NONE; |
| 172 InputTarget current_scroll_target = InputTarget::NONE; | 174 InputTarget current_scroll_target = InputTarget::NONE; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 uint16_t last_frame_index_ = -1; | 207 uint16_t last_frame_index_ = -1; |
| 206 | 208 |
| 207 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; | 209 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; |
| 208 | 210 |
| 209 DISALLOW_COPY_AND_ASSIGN(VrShellGl); | 211 DISALLOW_COPY_AND_ASSIGN(VrShellGl); |
| 210 }; | 212 }; |
| 211 | 213 |
| 212 } // namespace vr_shell | 214 } // namespace vr_shell |
| 213 | 215 |
| 214 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 216 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
| OLD | NEW |