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

Unified Diff: third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp

Issue 1790753002: Expose GLES2Interface to blink, and delete isContextLost() from WGC3D. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wgc3d: add platform build deps Created 4 years, 9 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
Index: third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp b/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp
index 45067a6197b26864d7ead05c9699e3cc70fe17fa..e8643906b96843057e075e5280ea820b39d7a89e 100644
--- a/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp
+++ b/third_party/WebKit/Source/platform/graphics/gpu/SharedContextRateLimiter.cpp
@@ -4,6 +4,7 @@
#include "platform/graphics/gpu/SharedContextRateLimiter.h"
+#include "gpu/command_buffer/client/gles2_interface.h"
#include "platform/graphics/gpu/Extensions3DUtil.h"
#include "public/platform/Platform.h"
#include "public/platform/WebGraphicsContext3D.h"
@@ -28,9 +29,9 @@ SharedContextRateLimiter::SharedContextRateLimiter(unsigned maxPendingTicks)
if (!m_contextProvider)
return;
- WebGraphicsContext3D* context = m_contextProvider->context3d();
- if (context && !context->isContextLost()) {
- OwnPtr<Extensions3DUtil> extensionsUtil = Extensions3DUtil::create(context);
+ gpu::gles2::GLES2Interface* gl = m_contextProvider->getGLInterface();
+ if (gl && gl->GetGraphicsResetStatusKHR() == GL_NO_ERROR) {
+ OwnPtr<Extensions3DUtil> extensionsUtil = Extensions3DUtil::create(m_contextProvider->context3d(), gl);
// TODO(junov): when the GLES 3.0 command buffer is ready, we could use fenceSync instead
m_canUseSyncQueries = extensionsUtil->supportsExtension("GL_CHROMIUM_sync_query");
}
@@ -41,11 +42,12 @@ void SharedContextRateLimiter::tick()
if (!m_contextProvider)
return;
- WebGraphicsContext3D* context = m_contextProvider->context3d();
+ gpu::gles2::GLES2Interface* gl = m_contextProvider->getGLInterface();
- if (!context || context->isContextLost())
+ if (!gl || gl->GetGraphicsResetStatusKHR() != GL_NO_ERROR)
return;
+ WebGraphicsContext3D* context = m_contextProvider->context3d();
m_queries.append(m_canUseSyncQueries ? context->createQueryEXT() : 0);
if (m_canUseSyncQueries) {
context->beginQueryEXT(GL_COMMANDS_COMPLETED_CHROMIUM, m_queries.last());
@@ -69,8 +71,9 @@ void SharedContextRateLimiter::reset()
if (!m_contextProvider)
return;
- WebGraphicsContext3D* context = m_contextProvider->context3d();
- if (context && !context->isContextLost()) {
+ gpu::gles2::GLES2Interface* gl = m_contextProvider->getGLInterface();
+ if (gl && gl->GetGraphicsResetStatusKHR() == GL_NO_ERROR) {
+ WebGraphicsContext3D* context = m_contextProvider->context3d();
while (m_queries.size() > 0) {
context->deleteQueryEXT(m_queries.first());
m_queries.removeFirst();

Powered by Google App Engine
This is Rietveld 408576698