| Index: Source/core/html/canvas/WebGL2RenderingContextBase.cpp
|
| diff --git a/Source/core/html/canvas/WebGL2RenderingContextBase.cpp b/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
|
| index 7e0b8e8e8e140c228f352d93904641c9fe5ed1bf..fc6847ba6ca970f4b6a80fd8283a7d447ac7f31c 100644
|
| --- a/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
|
| +++ b/Source/core/html/canvas/WebGL2RenderingContextBase.cpp
|
| @@ -1080,7 +1080,7 @@ void WebGL2RenderingContextBase::beginQuery(GLenum target, WebGLQuery* query)
|
| return;
|
| }
|
|
|
| - if (!query->isCompatibleTarget(target)) {
|
| + if (query->getTarget() && query->getTarget() != target) {
|
| synthesizeGLError(GL_INVALID_OPERATION, "beginQuery", "query type does not match target");
|
| return;
|
| }
|
| @@ -1110,7 +1110,8 @@ void WebGL2RenderingContextBase::beginQuery(GLenum target, WebGLQuery* query)
|
| return;
|
| }
|
|
|
| - query->setTarget(target);
|
| + if (!query->getTarget())
|
| + query->setTarget(target);
|
|
|
| webContext()->beginQueryEXT(target, query->object());
|
| }
|
|
|