summaryrefslogtreecommitdiffstats
path: root/gpu/blink
diff options
context:
space:
mode:
authorzmo <zmo@chromium.org>2015-10-16 16:45:35 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-16 23:46:33 +0000
commit3e01e151ef3207671f9fe0a9048083ad74d68837 (patch)
tree1c7c3b86d359de225a8aa1c8622b3403fa180fe7 /gpu/blink
parent2d2a5b924948188588006e29dc88771f862c66e6 (diff)
downloadchromium_src-3e01e151ef3207671f9fe0a9048083ad74d68837.zip
chromium_src-3e01e151ef3207671f9fe0a9048083ad74d68837.tar.gz
chromium_src-3e01e151ef3207671f9fe0a9048083ad74d68837.tar.bz2
Fix WebGL 2's getIndexedParameter function.
BUG=527249 TEST=conformance2/state/gl-object-get-calls.html R=kbr@chromium.org,piman@chromium.org,bajones@chromium.org Review URL: https://codereview.chromium.org/1413633004 Cr-Commit-Position: refs/heads/master@{#354641}
Diffstat (limited to 'gpu/blink')
-rw-r--r--gpu/blink/webgraphicscontext3d_impl.cc5
-rw-r--r--gpu/blink/webgraphicscontext3d_impl.h8
2 files changed, 13 insertions, 0 deletions
diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
index 7213130..ae7b160 100644
--- a/gpu/blink/webgraphicscontext3d_impl.cc
+++ b/gpu/blink/webgraphicscontext3d_impl.cc
@@ -467,6 +467,11 @@ DELEGATE_TO_GL_2(getIntegerv, GetIntegerv, WGC3Denum, WGC3Dint*)
DELEGATE_TO_GL_2(getInteger64v, GetInteger64v, WGC3Denum, WGC3Dint64*)
+DELEGATE_TO_GL_3(getIntegeri_v, GetIntegeri_v, WGC3Denum, WGC3Duint, WGC3Dint*)
+
+DELEGATE_TO_GL_3(getInteger64i_v, GetInteger64i_v,
+ WGC3Denum, WGC3Duint, WGC3Dint64*)
+
DELEGATE_TO_GL_3(getProgramiv, GetProgramiv, WebGLId, WGC3Denum, WGC3Dint*)
blink::WebString WebGraphicsContext3DImpl::getProgramInfoLog(
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
index d5199dd..e0cd53b 100644
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -195,6 +195,14 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
void getInteger64v(blink::WGC3Denum pname, blink::WGC3Dint64* value) override;
+ void getIntegeri_v(blink::WGC3Denum target,
+ blink::WGC3Duint index,
+ blink::WGC3Dint *data) override;
+
+ void getInteger64i_v(blink::WGC3Denum pname,
+ blink::WGC3Duint index,
+ blink::WGC3Dint64* value) override;
+
void getProgramiv(blink::WebGLId program,
blink::WGC3Denum pname,
blink::WGC3Dint* value) override;