| 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 // This file contains the binary format definition of the command buffer and | 5 // This file contains the binary format definition of the command buffer and |
| 6 // command buffer commands. | 6 // command buffer commands. |
| 7 | 7 |
| 8 #include "gpu/command_buffer/common/cmd_buffer_common.h" | 8 #include "gpu/command_buffer/common/cmd_buffer_common.h" |
| 9 | 9 |
| 10 #include "gpu/command_buffer/common/command_buffer.h" | 10 #include "gpu/command_buffer/common/command_buffer.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 #undef COMMON_COMMAND_BUFFER_CMD_OP | 25 #undef COMMON_COMMAND_BUFFER_CMD_OP |
| 26 }; | 26 }; |
| 27 | 27 |
| 28 int id = static_cast<int>(command_id); | 28 int id = static_cast<int>(command_id); |
| 29 return (id >= 0 && id < kNumCommands) ? names[id] : "*unknown-command*"; | 29 return (id >= 0 && id < kNumCommands) ? names[id] : "*unknown-command*"; |
| 30 } | 30 } |
| 31 | 31 |
| 32 } // namespace cmd | 32 } // namespace cmd |
| 33 | 33 |
| 34 #if !defined(NACL_WIN64) | |
| 35 // TODO(apatrick): this is a temporary optimization while skia is calling | 34 // TODO(apatrick): this is a temporary optimization while skia is calling |
| 36 // RendererGLContext::MakeCurrent prior to every GL call. It saves returning 6 | 35 // RendererGLContext::MakeCurrent prior to every GL call. It saves returning 6 |
| 37 // ints redundantly when only the error is needed for the CommandBufferProxy | 36 // ints redundantly when only the error is needed for the CommandBufferProxy |
| 38 // implementation. | 37 // implementation. |
| 39 error::Error CommandBuffer::GetLastError() { | 38 error::Error CommandBuffer::GetLastError() { |
| 40 return GetLastState().error; | 39 return GetLastState().error; |
| 41 } | 40 } |
| 42 #endif | |
| 43 | 41 |
| 44 } // namespace gpu | 42 } // namespace gpu |
| 45 | 43 |
| 46 | 44 |
| OLD | NEW |