Index: gpu/blink/webgraphicscontext3d_impl.cc |
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc |
index e469532efd65354298f960922cacada1a4d9fae1..cf0dc695fd71143a40fe831f504c4ce92b9cca67 100644 |
--- a/gpu/blink/webgraphicscontext3d_impl.cc |
+++ b/gpu/blink/webgraphicscontext3d_impl.cc |
@@ -33,6 +33,7 @@ using blink::WGC3Dsizeiptr; |
using blink::WGC3Duint64; |
using blink::WGC3Duint; |
using blink::WebGLId; |
+using blink::WGC3Dsync; |
namespace gpu_blink { |
@@ -1037,8 +1038,11 @@ DELEGATE_TO_GL_3(clearBufferiv, ClearBufferiv, WGC3Denum, WGC3Dint, |
const WGC3Dint *) |
DELEGATE_TO_GL_3(clearBufferuiv, ClearBufferuiv, WGC3Denum, WGC3Dint, |
const WGC3Duint *) |
-//DELEGATE_TO_GL_3R(clientWaitSync, ClientWaitSync, WebGLId, WGC3Dbitfield, |
-// WGC3Duint64, WGC3Denum) |
+WGC3Denum WebGraphicsContext3DImpl::clientWaitSync(WGC3Dsync sync, |
+ WGC3Dbitfield flags, |
+ WGC3Duint64 timeout) { |
+ return gl_->ClientWaitSync(reinterpret_cast<GLsync>(sync), flags, timeout); |
+} |
//DELEGATE_TO_GL_9(compressedTexImage3D, CompressedTexImage3D, WGC3Denum, |
// WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei, |
// WGC3Dint, WGC3Dsizei, const void *) |
@@ -1063,20 +1067,31 @@ WebGLId WebGraphicsContext3DImpl::createTransformFeedback() { |
void WebGraphicsContext3DImpl::deleteSampler(WebGLId sampler) { |
gl_->DeleteSamplers(1, &sampler); |
} |
-//DELEGATE_TO_GL_1(deleteSync, DeleteSync, WebGLId) |
+void WebGraphicsContext3DImpl::deleteSync(WGC3Dsync sync) { |
+ gl_->DeleteSync(reinterpret_cast<GLsync>(sync)); |
+} |
void WebGraphicsContext3DImpl::deleteTransformFeedback(WebGLId tf) { |
gl_->DeleteTransformFeedbacks(1, &tf); |
} |
+void WebGraphicsContext3DImpl::drawRangeElements( |
+ WGC3Denum mode, WGC3Duint start, WGC3Duint end, WGC3Dsizei count, |
+ WGC3Denum type, WGC3Dintptr offset) { |
+ gl_->DrawRangeElements(mode, start, end, count, type, |
+ reinterpret_cast<void*>(static_cast<intptr_t>(offset))); |
+} |
DELEGATE_TO_GL(endTransformFeedback, EndTransformFeedback) |
-//DELEGATE_TO_GL_2R(fenceSync, FenceSync, WGC3Denum, WGC3Dbitfield, WebGLId) |
+WGC3Dsync WebGraphicsContext3DImpl::fenceSync(WGC3Denum condition, |
+ WGC3Dbitfield flags) { |
+ return reinterpret_cast<WGC3Dsync>(gl_->FenceSync(condition, flags)); |
+} |
DELEGATE_TO_GL_5(framebufferTextureLayer, FramebufferTextureLayer, WGC3Denum, |
WGC3Denum, WGC3Duint, WGC3Dint, WGC3Dint) |
DELEGATE_TO_GL_5(getActiveUniformBlockName, GetActiveUniformBlockName, |
WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dchar *) |
DELEGATE_TO_GL_4(getActiveUniformBlockiv, GetActiveUniformBlockiv, WGC3Duint, |
WGC3Duint, WGC3Denum, WGC3Dint *) |
-//DELEGATE_TO_GL_5(getActiveUniformsiv, GetActiveUniformsiv, WGC3Duint, |
-// WGC3Dsizei, const WGC3Duint *, WGC3Denum, WGC3Dint *) |
+DELEGATE_TO_GL_5(getActiveUniformsiv, GetActiveUniformsiv, WGC3Duint, |
+ WGC3Dsizei, const WGC3Duint *, WGC3Denum, WGC3Dint *) |
DELEGATE_TO_GL_2R(getFragDataLocation, GetFragDataLocation, WGC3Duint, |
const WGC3Dchar *, WGC3Dint) |
DELEGATE_TO_GL_5(getInternalformativ, GetInternalformativ, WGC3Denum, WGC3Denum, |
@@ -1085,13 +1100,13 @@ DELEGATE_TO_GL_3(getSamplerParameterfv, GetSamplerParameterfv, WGC3Duint, |
WGC3Denum, WGC3Dfloat *) |
DELEGATE_TO_GL_3(getSamplerParameteriv, GetSamplerParameteriv, WGC3Duint, |
WGC3Denum, WGC3Dint *) |
-//DELEGATE_TO_GL_7(getTransformFeedbackVarying, GetTransformFeedbackVarying, |
-// WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dsizei *, |
-// WGC3Denum *, WGC3Dchar *) |
+DELEGATE_TO_GL_7(getTransformFeedbackVarying, GetTransformFeedbackVarying, |
+ WGC3Duint, WGC3Duint, WGC3Dsizei, WGC3Dsizei *, WGC3Dsizei *, |
+ WGC3Denum *, WGC3Dchar *) |
DELEGATE_TO_GL_2R(getUniformBlockIndex, GetUniformBlockIndex, WGC3Duint, |
const WGC3Dchar *, WGC3Duint) |
-//DELEGATE_TO_GL_4(getUniformIndices, GetUniformIndices, WGC3Duint, WGC3Dsizei, |
-// const WGC3Dchar *const*, WGC3Duint *) |
+DELEGATE_TO_GL_4(getUniformIndices, GetUniformIndices, WGC3Duint, WGC3Dsizei, |
+ const WGC3Dchar *const*, WGC3Duint *) |
//DELEGATE_TO_GL_3(getUniformuiv, GetUniformuiv, WGC3Duint, WGC3Dint, |
// WGC3Duint *) |
//DELEGATE_TO_GL_3(getVertexAttribIiv, GetVertexAttribIiv, WGC3Duint, |
@@ -1104,7 +1119,9 @@ DELEGATE_TO_GL_7(invalidateSubFramebuffer, InvalidateSubFramebuffer, WGC3Denum, |
WGC3Dsizei, const WGC3Denum *, WGC3Dint, WGC3Dint, WGC3Dsizei, |
WGC3Dsizei) |
DELEGATE_TO_GL_1R(isSampler, IsSampler, WebGLId, WGC3Dboolean) |
-//DELEGATE_TO_GL_1R(isSync, IsSync, WebGLId, WGC3Dboolean) |
+WGC3Dboolean WebGraphicsContext3DImpl::isSync(WGC3Dsync sync) { |
+ return gl_->IsSync(reinterpret_cast<GLsync>(sync)); |
+} |
DELEGATE_TO_GL_1R(isTransformFeedback, IsTransformFeedback, WGC3Duint, |
WGC3Dboolean) |
DELEGATE_TO_GL(pauseTransformFeedback, PauseTransformFeedback) |
@@ -1173,7 +1190,11 @@ void WebGraphicsContext3DImpl::vertexAttribIPointer( |
index, size, type, stride, |
reinterpret_cast<void*>(static_cast<intptr_t>(offset))); |
} |
-//DELEGATE_TO_GL_3(waitSync, WaitSync, WebGLId, WGC3Dbitfield, WGC3Duint64) |
+void WebGraphicsContext3DImpl::waitSync(WGC3Dsync sync, |
+ WGC3Dbitfield flags, |
+ WGC3Duint64 timeout) { |
+ gl_->WaitSync(reinterpret_cast<GLsync>(sync), flags, timeout); |
+} |
GrGLInterface* WebGraphicsContext3DImpl::createGrGLInterface() { |
return skia_bindings::CreateCommandBufferSkiaGLBinding(); |