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

Unified Diff: chrome/browser/android/vr_shell/vr_shell_renderer.h

Issue 2301633002: Refactor Vr activity into ChromeTabbedActivity. (Closed)
Patch Set: UiElements are now structs Created 4 years, 3 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: chrome/browser/android/vr_shell/vr_shell_renderer.h
diff --git a/chrome/browser/android/vr_shell/vr_shell_renderer.h b/chrome/browser/android/vr_shell/vr_shell_renderer.h
index 2c69069e00f25c14e1f2ba5dca658cc8c5e390c1..154e8e5b63a00b943b6669f3cb9171d68d43b45d 100644
--- a/chrome/browser/android/vr_shell/vr_shell_renderer.h
+++ b/chrome/browser/android/vr_shell/vr_shell_renderer.h
@@ -10,6 +10,7 @@
#include <vector>
#include "base/macros.h"
+#include "chrome/browser/android/vr_shell/vr_util.h"
#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
@@ -32,7 +33,8 @@ class TexturedQuadRenderer {
~TexturedQuadRenderer();
// Draw the content rect in the texture quad.
- void Draw(int texture_data_handle, const gvr::Mat4f& combined_matrix);
+ void Draw(int texture_data_handle, const gvr::Mat4f& combined_matrix,
+ const Rectf& copy_rect);
private:
GLuint vertex_shader_handle_;
@@ -40,6 +42,7 @@ class TexturedQuadRenderer {
GLuint program_handle_;
GLuint combined_matrix_handle_;
GLuint texture_uniform_handle_;
+ GLuint copy_rect_uniform_handle_;
GLuint position_handle_;
GLuint texture_coordinate_handle_;
@@ -92,6 +95,7 @@ class VrShellRenderer {
private:
std::unique_ptr<TexturedQuadRenderer> textured_quad_renderer_;
std::unique_ptr<WebVrRenderer> webvr_renderer_;
+
DISALLOW_COPY_AND_ASSIGN(VrShellRenderer);
};

Powered by Google App Engine
This is Rietveld 408576698