| 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 // A class to emulate GLES2 over command buffers. | 5 // A class to emulate GLES2 over command buffers. |
| 6 | 6 |
| 7 #include "../client/gles2_implementation.h" | 7 #include "../client/gles2_implementation.h" |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttribDivisorANGLE(" | 1166 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glVertexAttribDivisorANGLE(" |
| 1167 << index << ", " | 1167 << index << ", " |
| 1168 << divisor << ") "); | 1168 << divisor << ") "); |
| 1169 // Record the info on the client side. | 1169 // Record the info on the client side. |
| 1170 vertex_array_object_manager_->SetAttribDivisor(index, divisor); | 1170 vertex_array_object_manager_->SetAttribDivisor(index, divisor); |
| 1171 helper_->VertexAttribDivisorANGLE(index, divisor); | 1171 helper_->VertexAttribDivisorANGLE(index, divisor); |
| 1172 CheckGLError(); | 1172 CheckGLError(); |
| 1173 } | 1173 } |
| 1174 | 1174 |
| 1175 void GLES2Implementation::ShaderSource( | 1175 void GLES2Implementation::ShaderSource( |
| 1176 GLuint shader, GLsizei count, const GLchar* const* source, const GLint* leng
th) { | 1176 GLuint shader, GLsizei count, const char** source, const GLint* length) { |
| 1177 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 1177 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| 1178 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource(" | 1178 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource(" |
| 1179 << shader << ", " << count << ", " | 1179 << shader << ", " << count << ", " |
| 1180 << static_cast<const void*>(source) << ", " | 1180 << static_cast<const void*>(source) << ", " |
| 1181 << static_cast<const void*>(length) << ")"); | 1181 << static_cast<const void*>(length) << ")"); |
| 1182 GPU_CLIENT_LOG_CODE_BLOCK({ | 1182 GPU_CLIENT_LOG_CODE_BLOCK({ |
| 1183 for (GLsizei ii = 0; ii < count; ++ii) { | 1183 for (GLsizei ii = 0; ii < count; ++ii) { |
| 1184 if (source[ii]) { | 1184 if (source[ii]) { |
| 1185 if (length && length[ii] >= 0) { | 1185 if (length && length[ii] >= 0) { |
| 1186 std::string str(source[ii], length[ii]); | 1186 std::string str(source[ii], length[ii]); |
| (...skipping 2252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3439 return; | 3439 return; |
| 3440 } | 3440 } |
| 3441 | 3441 |
| 3442 // Include the auto-generated part of this file. We split this because it means | 3442 // Include the auto-generated part of this file. We split this because it means |
| 3443 // we can easily edit the non-auto generated parts right here in this file | 3443 // we can easily edit the non-auto generated parts right here in this file |
| 3444 // instead of having to edit some template or the code generator. | 3444 // instead of having to edit some template or the code generator. |
| 3445 #include "../client/gles2_implementation_impl_autogen.h" | 3445 #include "../client/gles2_implementation_impl_autogen.h" |
| 3446 | 3446 |
| 3447 } // namespace gles2 | 3447 } // namespace gles2 |
| 3448 } // namespace gpu | 3448 } // namespace gpu |
| OLD | NEW |