OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "cc/test/test_gles2_interface.h" | 5 #include "cc/test/test_gles2_interface.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "cc/test/test_web_graphics_context_3d.h" | 8 #include "cc/test/test_web_graphics_context_3d.h" |
9 #include "gpu/GLES2/gl2extchromium.h" | 9 #include "gpu/GLES2/gl2extchromium.h" |
10 | 10 |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
316 return test_context_->unmapBufferCHROMIUM(target); | 316 return test_context_->unmapBufferCHROMIUM(target); |
317 } | 317 } |
318 | 318 |
319 void TestGLES2Interface::BufferData(GLenum target, | 319 void TestGLES2Interface::BufferData(GLenum target, |
320 GLsizeiptr size, | 320 GLsizeiptr size, |
321 const void* data, | 321 const void* data, |
322 GLenum usage) { | 322 GLenum usage) { |
323 test_context_->bufferData(target, size, data, usage); | 323 test_context_->bufferData(target, size, data, usage); |
324 } | 324 } |
325 | 325 |
326 void TestGLES2Interface::WaitSyncPointCHROMIUM(GLuint sync_point) { | 326 void TestGLES2Interface::WaitSyncPointCHROMIUM(GLuint sync_point, |
327 test_context_->waitSyncPoint(sync_point); | 327 const GLbyte* sync_token) { |
| 328 test_context_->waitSyncPoint(sync_point, sync_token); |
328 } | 329 } |
329 | 330 |
330 GLuint TestGLES2Interface::InsertSyncPointCHROMIUM() { | 331 GLuint TestGLES2Interface::InsertSyncPointCHROMIUM() { |
331 return test_context_->insertSyncPoint(); | 332 return test_context_->insertSyncPoint(); |
332 } | 333 } |
333 | 334 |
334 void TestGLES2Interface::BeginQueryEXT(GLenum target, GLuint id) { | 335 void TestGLES2Interface::BeginQueryEXT(GLenum target, GLuint id) { |
335 test_context_->beginQueryEXT(target, id); | 336 test_context_->beginQueryEXT(target, id); |
336 } | 337 } |
337 | 338 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 test_context_->loseContextCHROMIUM(current, other); | 388 test_context_->loseContextCHROMIUM(current, other); |
388 } | 389 } |
389 | 390 |
390 GLenum TestGLES2Interface::GetGraphicsResetStatusKHR() { | 391 GLenum TestGLES2Interface::GetGraphicsResetStatusKHR() { |
391 if (test_context_->isContextLost()) | 392 if (test_context_->isContextLost()) |
392 return GL_UNKNOWN_CONTEXT_RESET_KHR; | 393 return GL_UNKNOWN_CONTEXT_RESET_KHR; |
393 return GL_NO_ERROR; | 394 return GL_NO_ERROR; |
394 } | 395 } |
395 | 396 |
396 } // namespace cc | 397 } // namespace cc |
OLD | NEW |