diff options
| author | bajones <bajones@chromium.org> | 2015-05-06 15:46:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-06 22:48:24 +0000 |
| commit | 7daa5e1b6e7f021bc2489a481216d6d00ba5658f (patch) | |
| tree | c125aebdcf2b4354c44f5b674fde3af7bc68eac2 | |
| parent | 476313b517a8814db50a074061eb62ec62a27d0e (diff) | |
| download | chromium_src-7daa5e1b6e7f021bc2489a481216d6d00ba5658f.zip chromium_src-7daa5e1b6e7f021bc2489a481216d6d00ba5658f.tar.gz chromium_src-7daa5e1b6e7f021bc2489a481216d6d00ba5658f.tar.bz2 | |
Wired up compressedTex{Sub}Image3D entry points in WebGraphicsContext3DImpl
BUG=429053
Review URL: https://codereview.chromium.org/1126373002
Cr-Commit-Position: refs/heads/master@{#328639}
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.cc | 12 | ||||
| -rw-r--r-- | gpu/blink/webgraphicscontext3d_impl.h | 40 |
2 files changed, 26 insertions, 26 deletions
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc index 5d6e76d..d35bb9d 100644 --- a/gpu/blink/webgraphicscontext3d_impl.cc +++ b/gpu/blink/webgraphicscontext3d_impl.cc @@ -1025,12 +1025,12 @@ WGC3Denum WebGraphicsContext3DImpl::clientWaitSync(WGC3Dsync sync, 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 *) -//DELEGATE_TO_GL_11(compressedTexSubImage3D, CompressedTexSubImage3D, WGC3Denum, -// WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, -// WGC3Dsizei, WGC3Dsizei, WGC3Denum, WGC3Dsizei, const void *) +DELEGATE_TO_GL_9(compressedTexImage3D, CompressedTexImage3D, WGC3Denum, + WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei, + WGC3Dint, WGC3Dsizei, const void *) +DELEGATE_TO_GL_11(compressedTexSubImage3D, CompressedTexSubImage3D, WGC3Denum, + WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, + WGC3Dsizei, WGC3Dsizei, WGC3Denum, WGC3Dsizei, const void *) DELEGATE_TO_GL_5(copyBufferSubData, CopyBufferSubData, WGC3Denum, WGC3Denum, WGC3Dintptr, WGC3Dintptr, WGC3Dsizeiptr) DELEGATE_TO_GL_9(copyTexSubImage3D, CopyTexSubImage3D, WGC3Denum, WGC3Dint, diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h index bde6406..00bca2b 100644 --- a/gpu/blink/webgraphicscontext3d_impl.h +++ b/gpu/blink/webgraphicscontext3d_impl.h @@ -675,26 +675,26 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl virtual blink::WGC3Denum clientWaitSync(blink::WGC3Dsync sync, blink::WGC3Dbitfield flags, blink::WGC3Duint64 timeout); - //virtual void compressedTexImage3D(blink::WGC3Denum target, - // blink::WGC3Dint level, - // blink::WGC3Denum internalformat, - // blink::WGC3Dsizei width, - // blink::WGC3Dsizei height, - // blink::WGC3Dsizei depth, - // blink::WGC3Dint border, - // blink::WGC3Dsizei imageSize, - // const void *data); - //virtual void compressedTexSubImage3D(blink::WGC3Denum target, - // blink::WGC3Dint level, - // blink::WGC3Dint xoffset, - // blink::WGC3Dint yoffset, - // blink::WGC3Dint zoffset, - // blink::WGC3Dsizei width, - // blink::WGC3Dsizei height, - // blink::WGC3Dsizei depth, - // blink::WGC3Denum format, - // blink::WGC3Dsizei imageSize, - // const void *data); + virtual void compressedTexImage3D(blink::WGC3Denum target, + blink::WGC3Dint level, + blink::WGC3Denum internalformat, + blink::WGC3Dsizei width, + blink::WGC3Dsizei height, + blink::WGC3Dsizei depth, + blink::WGC3Dint border, + blink::WGC3Dsizei imageSize, + const void *data); + virtual void compressedTexSubImage3D(blink::WGC3Denum target, + blink::WGC3Dint level, + blink::WGC3Dint xoffset, + blink::WGC3Dint yoffset, + blink::WGC3Dint zoffset, + blink::WGC3Dsizei width, + blink::WGC3Dsizei height, + blink::WGC3Dsizei depth, + blink::WGC3Denum format, + blink::WGC3Dsizei imageSize, + const void *data); virtual void copyBufferSubData(blink::WGC3Denum readTarget, blink::WGC3Denum writeTarget, blink::WGC3Dintptr readOffset, |