| 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 #include "chrome/browser/android/vr_shell/vr_shell_renderer.h" | 5 #include "chrome/browser/android/vr_shell/vr_shell_renderer.h" |
| 6 | 6 |
| 7 #include "chrome/browser/android/vr_shell/vr_gl_util.h" | 7 #include "chrome/browser/android/vr_shell/vr_gl_util.h" |
| 8 | 8 |
| 9 namespace { | 9 namespace { |
| 10 | 10 |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 | 303 |
| 304 // Blit texture to buffer | 304 // Blit texture to buffer |
| 305 glDrawArrays(GL_TRIANGLE_FAN, 0, 4); | 305 glDrawArrays(GL_TRIANGLE_FAN, 0, 4); |
| 306 | 306 |
| 307 glDisableVertexAttribArray(position_handle_); | 307 glDisableVertexAttribArray(position_handle_); |
| 308 | 308 |
| 309 glBindBuffer(GL_ARRAY_BUFFER, old_buffer); | 309 glBindBuffer(GL_ARRAY_BUFFER, old_buffer); |
| 310 } | 310 } |
| 311 | 311 |
| 312 // Note that we don't explicitly delete gl objects here, they're deleted | 312 // Note that we don't explicitly delete gl objects here, they're deleted |
| 313 // automatically when we call ClearGLBindings, and deleting them here leads to | 313 // automatically when we call ShutdownGL, and deleting them here leads to |
| 314 // segfaults. | 314 // segfaults. |
| 315 WebVrRenderer::~WebVrRenderer() = default; | 315 WebVrRenderer::~WebVrRenderer() = default; |
| 316 | 316 |
| 317 ReticleRenderer::ReticleRenderer() | 317 ReticleRenderer::ReticleRenderer() |
| 318 : BaseRenderer(RETICLE_VERTEX_SHADER, RETICLE_FRAGMENT_SHADER) { | 318 : BaseRenderer(RETICLE_VERTEX_SHADER, RETICLE_FRAGMENT_SHADER) { |
| 319 combined_matrix_handle_ = | 319 combined_matrix_handle_ = |
| 320 glGetUniformLocation(program_handle_, "u_CombinedMatrix"); | 320 glGetUniformLocation(program_handle_, "u_CombinedMatrix"); |
| 321 color_handle_ = glGetUniformLocation(program_handle_, "color"); | 321 color_handle_ = glGetUniformLocation(program_handle_, "color"); |
| 322 ring_diameter_handle_ = | 322 ring_diameter_handle_ = |
| 323 glGetUniformLocation(program_handle_, "ring_diameter"); | 323 glGetUniformLocation(program_handle_, "ring_diameter"); |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 | 397 |
| 398 VrShellRenderer::VrShellRenderer() | 398 VrShellRenderer::VrShellRenderer() |
| 399 : textured_quad_renderer_(new TexturedQuadRenderer), | 399 : textured_quad_renderer_(new TexturedQuadRenderer), |
| 400 webvr_renderer_(new WebVrRenderer), | 400 webvr_renderer_(new WebVrRenderer), |
| 401 reticle_renderer_(new ReticleRenderer), | 401 reticle_renderer_(new ReticleRenderer), |
| 402 laser_renderer_(new LaserRenderer) {} | 402 laser_renderer_(new LaserRenderer) {} |
| 403 | 403 |
| 404 VrShellRenderer::~VrShellRenderer() = default; | 404 VrShellRenderer::~VrShellRenderer() = default; |
| 405 | 405 |
| 406 } // namespace vr_shell | 406 } // namespace vr_shell |
| OLD | NEW |