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

Unified Diff: Source/core/html/canvas/WebGLQuery.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 | « Source/core/html/canvas/WebGLQuery.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/canvas/WebGLQuery.cpp
diff --git a/Source/core/html/canvas/WebGLQuery.cpp b/Source/core/html/canvas/WebGLQuery.cpp
index 9fff37db0c1d4c06643f2a4151486c5b8a0e0f73..6f43f5859dcc1a0086f1e5f826ff63c70ce1053d 100644
--- a/Source/core/html/canvas/WebGLQuery.cpp
+++ b/Source/core/html/canvas/WebGLQuery.cpp
@@ -37,26 +37,10 @@ WebGLQuery::WebGLQuery(WebGL2RenderingContextBase* ctx)
void WebGLQuery::setTarget(GLenum target)
{
ASSERT(object());
- ASSERT(isCompatibleTarget(target));
+ ASSERT(!m_target);
m_target = target;
}
-bool WebGLQuery::isCompatibleTarget(GLenum target)
-{
- if (!m_target)
- return true;
-
- switch (target) {
- // The SAMPLES_PASSED targets are interchangable.
- case GL_ANY_SAMPLES_PASSED:
- case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
- return m_target == GL_ANY_SAMPLES_PASSED || m_target == GL_ANY_SAMPLES_PASSED_CONSERVATIVE;
- // Otherwise target is finalized the first time beginQuery() is called.
- default:
- return m_target == target;
- }
-}
-
void WebGLQuery::deleteObjectImpl(WebGraphicsContext3D* context3d)
{
context3d->deleteQueryEXT(m_object);
« no previous file with comments | « Source/core/html/canvas/WebGLQuery.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698