| 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 98714797e3da986267b1ff2e6dc213ef2804a86c..6f8206a9e5a3450d2f364a820250e5c0a920762c 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell_renderer.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell_renderer.h
|
| @@ -37,6 +37,8 @@ enum ShaderID {
|
| GRADIENT_GRID_FRAGMENT_SHADER,
|
| CONTROLLER_VERTEX_SHADER,
|
| CONTROLLER_FRAGMENT_SHADER,
|
| + SKIA_QUAD_VERTEX_SHADER,
|
| + SKIA_QUAD_FRAGMENT_SHADER,
|
| SHADER_ID_MAX
|
| };
|
|
|
| @@ -58,7 +60,7 @@ struct Line3d {
|
| Vertex3d end;
|
| };
|
|
|
| -struct TexturedQuad {
|
| +struct SkiaQuad {
|
| int texture_data_handle;
|
| vr::Mat4f view_proj_matrix;
|
| RectF copy_rect;
|
| @@ -101,6 +103,26 @@ class TexturedQuadRenderer : public BaseQuadRenderer {
|
| ~TexturedQuadRenderer() override;
|
|
|
| // Draw the content rect in the texture quad.
|
| + void Draw(int texture_data_handle,
|
| + const vr::Mat4f& view_proj_matrix,
|
| + const gfx::RectF& copy_rect,
|
| + float opacity);
|
| +
|
| + private:
|
| + GLuint model_view_proj_matrix_handle_;
|
| + GLuint copy_rect_uniform_handle_;
|
| + GLuint tex_uniform_handle_;
|
| + GLuint opacity_handle_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(TexturedQuadRenderer);
|
| +};
|
| +
|
| +class SkiaQuadRenderer : public BaseQuadRenderer {
|
| + public:
|
| + SkiaQuadRenderer();
|
| + ~SkiaQuadRenderer() override;
|
| +
|
| + // Draw the content rect in the texture quad.
|
| void AddQuad(int texture_data_handle,
|
| const vr::Mat4f& view_proj_matrix,
|
| const gfx::RectF& copy_rect,
|
| @@ -114,9 +136,9 @@ class TexturedQuadRenderer : public BaseQuadRenderer {
|
| GLuint tex_uniform_handle_;
|
| GLuint opacity_handle_;
|
|
|
| - std::queue<TexturedQuad> quad_queue_;
|
| + std::queue<SkiaQuad> quad_queue_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(TexturedQuadRenderer);
|
| + DISALLOW_COPY_AND_ASSIGN(SkiaQuadRenderer);
|
| };
|
|
|
| // Renders a page-generated stereo VR view.
|
| @@ -253,30 +275,18 @@ class VrShellRenderer {
|
| VrShellRenderer();
|
| ~VrShellRenderer();
|
|
|
| - TexturedQuadRenderer* GetTexturedQuadRenderer() {
|
| - return textured_quad_renderer_.get();
|
| - }
|
| -
|
| - WebVrRenderer* GetWebVrRenderer() { return webvr_renderer_.get(); }
|
| -
|
| - ReticleRenderer* GetReticleRenderer() { return reticle_renderer_.get(); }
|
| -
|
| - LaserRenderer* GetLaserRenderer() { return laser_renderer_.get(); }
|
| -
|
| - ControllerRenderer* GetControllerRenderer() {
|
| - return controller_renderer_.get();
|
| - }
|
| -
|
| - GradientQuadRenderer* GetGradientQuadRenderer() {
|
| - return gradient_quad_renderer_.get();
|
| - }
|
| -
|
| - GradientGridRenderer* GetGradientGridRenderer() {
|
| - return gradient_grid_renderer_.get();
|
| - }
|
| + TexturedQuadRenderer* GetTexturedQuadRenderer();
|
| + SkiaQuadRenderer* GetSkiaQuadRenderer();
|
| + WebVrRenderer* GetWebVrRenderer();
|
| + ReticleRenderer* GetReticleRenderer();
|
| + LaserRenderer* GetLaserRenderer();
|
| + ControllerRenderer* GetControllerRenderer();
|
| + GradientQuadRenderer* GetGradientQuadRenderer();
|
| + GradientGridRenderer* GetGradientGridRenderer();
|
|
|
| private:
|
| std::unique_ptr<TexturedQuadRenderer> textured_quad_renderer_;
|
| + std::unique_ptr<SkiaQuadRenderer> skia_quad_renderer_;
|
| std::unique_ptr<WebVrRenderer> webvr_renderer_;
|
| std::unique_ptr<ReticleRenderer> reticle_renderer_;
|
| std::unique_ptr<LaserRenderer> laser_renderer_;
|
|
|