Chromium Code Reviews| Index: chrome/browser/android/vr_shell/vr_shell_gl.cc |
| diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.cc b/chrome/browser/android/vr_shell/vr_shell_gl.cc |
| index 05a6c98fdd8852cc1aff038d50e06eef49145280..35a0afc63fa3f9b61450b6ef5ca821ac1eb9217f 100644 |
| --- a/chrome/browser/android/vr_shell/vr_shell_gl.cc |
| +++ b/chrome/browser/android/vr_shell/vr_shell_gl.cc |
| @@ -294,6 +294,8 @@ void VrShellGl::InitializeGl(gfx::AcceleratedWidget window) { |
| InitializeRenderer(); |
| + scene_->OnGLInitialized(); |
|
cjgrant
2017/04/21 14:30:13
So just my opinion here, but I really don't like t
mthiesse
2017/04/21 15:05:12
Agreed, but I avoided doing that for now because t
cjgrant
2017/04/21 15:19:33
Mind making a (single or separate) bug for rendere
|
| + |
| gfx::Size webvr_size = |
| device::GvrDelegate::GetRecommendedWebVrSize(gvr_api_.get()); |
| DVLOG(1) << __FUNCTION__ << ": resize initial to " << webvr_size.width() |
| @@ -994,18 +996,13 @@ void VrShellGl::DrawElements(const vr::Mat4f& view_proj_matrix, |
| vr::MatrixMul(view_proj_matrix, rect->TransformMatrix(), &transform); |
| switch (rect->fill) { |
| - case Fill::SKIA: { |
| - break; |
| - } |
| case Fill::OPAQUE_GRADIENT: { |
| - vr_shell_renderer_->GetTexturedQuadRenderer()->Flush(); |
| vr_shell_renderer_->GetGradientQuadRenderer()->Draw( |
| transform, rect->edge_color, rect->center_color, |
| rect->computed_opacity); |
| break; |
| } |
| case Fill::GRID_GRADIENT: { |
| - vr_shell_renderer_->GetTexturedQuadRenderer()->Flush(); |
| vr_shell_renderer_->GetGradientGridRenderer()->Draw( |
| transform, rect->edge_color, rect->center_color, |
| rect->gridline_count, rect->computed_opacity); |
| @@ -1013,16 +1010,19 @@ void VrShellGl::DrawElements(const vr::Mat4f& view_proj_matrix, |
| } |
| case Fill::CONTENT: { |
| gfx::RectF copy_rect(0, 0, 1, 1); |
| - vr_shell_renderer_->GetTexturedQuadRenderer()->AddQuad( |
| + vr_shell_renderer_->GetTexturedQuadRenderer()->Draw( |
| content_texture_id_, transform, copy_rect, rect->computed_opacity); |
| break; |
| } |
| + case Fill::SELF: { |
| + rect->Render(vr_shell_renderer_.get(), transform); |
| + break; |
| + } |
| default: |
| break; |
| } |
| } |
| - |
| - vr_shell_renderer_->GetTexturedQuadRenderer()->Flush(); |
| + vr_shell_renderer_->GetSkiaQuadRenderer()->Flush(); |
|
cjgrant
2017/04/21 14:30:13
This isn't healthy IMO. Longer-term, vr_shell_ren
mthiesse
2017/04/21 15:05:12
Changed to vr_shell_renderer_->Flush(); for now. L
|
| } |
| std::vector<const UiElement*> VrShellGl::GetElementsInDrawOrder( |