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

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell_renderer.cc

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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 unified diff | Download patch
OLDNEW
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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 #undef RECTANGULAR_TEXTURE_BUFFER 176 #undef RECTANGULAR_TEXTURE_BUFFER
177 } // namespace 177 } // namespace
178 178
179 namespace vr_shell { 179 namespace vr_shell {
180 180
181 BaseRenderer::BaseRenderer(ShaderID vertex_id, ShaderID fragment_id) { 181 BaseRenderer::BaseRenderer(ShaderID vertex_id, ShaderID fragment_id) {
182 std::string error; 182 std::string error;
183 GLuint vertex_shader_handle = CompileShader( 183 GLuint vertex_shader_handle = CompileShader(
184 GL_VERTEX_SHADER, GetShaderSource(vertex_id), error); 184 GL_VERTEX_SHADER, GetShaderSource(vertex_id), error);
185 CHECK(vertex_shader_handle) << error; 185 CHECK(vertex_shader_handle);
186 186
187 GLuint fragment_shader_handle = CompileShader( 187 GLuint fragment_shader_handle = CompileShader(
188 GL_FRAGMENT_SHADER, GetShaderSource(fragment_id), error); 188 GL_FRAGMENT_SHADER, GetShaderSource(fragment_id), error);
189 CHECK(fragment_shader_handle) << error; 189 CHECK(fragment_shader_handle);
190 190
191 program_handle_ = CreateAndLinkProgram(vertex_shader_handle, 191 program_handle_ = CreateAndLinkProgram(vertex_shader_handle,
192 fragment_shader_handle, error); 192 fragment_shader_handle, error);
193 CHECK(program_handle_) << error; 193 CHECK(program_handle_);
194 194
195 // Once the program is linked the shader objects are no longer needed 195 // Once the program is linked the shader objects are no longer needed
196 glDeleteShader(vertex_shader_handle); 196 glDeleteShader(vertex_shader_handle);
197 glDeleteShader(fragment_shader_handle); 197 glDeleteShader(fragment_shader_handle);
198 198
199 position_handle_ = glGetAttribLocation(program_handle_, "a_Position"); 199 position_handle_ = glGetAttribLocation(program_handle_, "a_Position");
200 tex_coord_handle_ = glGetAttribLocation(program_handle_, "a_TexCoordinate"); 200 tex_coord_handle_ = glGetAttribLocation(program_handle_, "a_TexCoordinate");
201 } 201 }
202 202
203 BaseRenderer::~BaseRenderer() = default; 203 BaseRenderer::~BaseRenderer() = default;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698