Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: Source/core/html/canvas/WebGL2RenderingContextBase.cpp

Issue 1205733005: Removed logic assuming ANY_SAMPLES_PASSED and ANY_SAMPLES_PASSED_CONSERVATIVE query types were inte… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/html/canvas/WebGLQuery.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
}
« no previous file with comments | « no previous file | Source/core/html/canvas/WebGLQuery.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698