| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "gpu/command_buffer/service/gles2_cmd_decoder.h" | 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
| 6 | 6 |
| 7 #include <stdio.h> | 7 #include <stdio.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <cmath> | 10 #include <cmath> |
| (...skipping 12393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 12404 length ? std::string(marker, length) : std::string(marker)); | 12404 length ? std::string(marker, length) : std::string(marker)); |
| 12405 } | 12405 } |
| 12406 | 12406 |
| 12407 void GLES2DecoderImpl::DoPushGroupMarkerEXT( | 12407 void GLES2DecoderImpl::DoPushGroupMarkerEXT( |
| 12408 GLsizei length, const GLchar* marker) { | 12408 GLsizei length, const GLchar* marker) { |
| 12409 if (!marker) { | 12409 if (!marker) { |
| 12410 marker = ""; | 12410 marker = ""; |
| 12411 } | 12411 } |
| 12412 std::string name = length ? std::string(marker, length) : std::string(marker); | 12412 std::string name = length ? std::string(marker, length) : std::string(marker); |
| 12413 debug_marker_manager_.PushGroup(name); | 12413 debug_marker_manager_.PushGroup(name); |
| 12414 gpu_tracer_->Begin(TRACE_DISABLED_BY_DEFAULT("gpu_group_marker"), name, | |
| 12415 kTraceGroupMarker); | |
| 12416 } | 12414 } |
| 12417 | 12415 |
| 12418 void GLES2DecoderImpl::DoPopGroupMarkerEXT(void) { | 12416 void GLES2DecoderImpl::DoPopGroupMarkerEXT(void) { |
| 12419 debug_marker_manager_.PopGroup(); | 12417 debug_marker_manager_.PopGroup(); |
| 12420 gpu_tracer_->End(kTraceGroupMarker); | |
| 12421 } | 12418 } |
| 12422 | 12419 |
| 12423 void GLES2DecoderImpl::DoBindTexImage2DCHROMIUM( | 12420 void GLES2DecoderImpl::DoBindTexImage2DCHROMIUM( |
| 12424 GLenum target, GLint image_id) { | 12421 GLenum target, GLint image_id) { |
| 12425 TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoBindTexImage2DCHROMIUM"); | 12422 TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoBindTexImage2DCHROMIUM"); |
| 12426 | 12423 |
| 12427 if (target == GL_TEXTURE_CUBE_MAP) { | 12424 if (target == GL_TEXTURE_CUBE_MAP) { |
| 12428 LOCAL_SET_GL_ERROR( | 12425 LOCAL_SET_GL_ERROR( |
| 12429 GL_INVALID_ENUM, | 12426 GL_INVALID_ENUM, |
| 12430 "glBindTexImage2DCHROMIUM", "invalid target"); | 12427 "glBindTexImage2DCHROMIUM", "invalid target"); |
| (...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 13143 } | 13140 } |
| 13144 } | 13141 } |
| 13145 | 13142 |
| 13146 // Include the auto-generated part of this file. We split this because it means | 13143 // Include the auto-generated part of this file. We split this because it means |
| 13147 // we can easily edit the non-auto generated parts right here in this file | 13144 // we can easily edit the non-auto generated parts right here in this file |
| 13148 // instead of having to edit some template or the code generator. | 13145 // instead of having to edit some template or the code generator. |
| 13149 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" | 13146 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" |
| 13150 | 13147 |
| 13151 } // namespace gles2 | 13148 } // namespace gles2 |
| 13152 } // namespace gpu | 13149 } // namespace gpu |
| OLD | NEW |