third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp - Issue 2437233002: Implement EXT_disjoint_timer_query_webgl2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp

Issue 2437233002: Implement EXT_disjoint_timer_query_webgl2 (Closed)

Patch Set: fix logic again Created 4 years, 2 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 | « third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.h ('k') | third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp

diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp

index ec15a081adb5c3d04c009940ab34266731150668..92dd970a30351cc7be61e053fb9c6e57baeddb34 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp

+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContext.cpp

@@ -12,7 +12,7 @@

#include "core/loader/FrameLoaderClient.h"

#include "gpu/command_buffer/client/gles2_interface.h"

#include "modules/webgl/EXTColorBufferFloat.h"

-#include "modules/webgl/EXTDisjointTimerQuery.h"

+#include "modules/webgl/EXTDisjointTimerQueryWebGL2.h"

#include "modules/webgl/EXTTextureFilterAnisotropic.h"

#include "modules/webgl/OESTextureFloatLinear.h"

#include "modules/webgl/WebGLCompressedTextureASTC.h"

@@ -115,7 +115,7 @@ void WebGL2RenderingContext::registerContextExtensions() {

// Register extensions.

registerExtension<EXTColorBufferFloat>(m_extColorBufferFloat);

- registerExtension<EXTDisjointTimerQuery>(m_extDisjointTimerQuery);

+ registerExtension<EXTDisjointTimerQueryWebGL2>(m_extDisjointTimerQueryWebGL2);

registerExtension<EXTTextureFilterAnisotropic>(m_extTextureFilterAnisotropic);

registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear);

registerExtension<WebGLCompressedTextureASTC>(m_webglCompressedTextureASTC);

@@ -133,7 +133,7 @@ void WebGL2RenderingContext::registerContextExtensions() {

DEFINE_TRACE(WebGL2RenderingContext) {

visitor->trace(m_extColorBufferFloat);

- visitor->trace(m_extDisjointTimerQuery);

+ visitor->trace(m_extDisjointTimerQueryWebGL2);

visitor->trace(m_extTextureFilterAnisotropic);

visitor->trace(m_oesTextureFloatLinear);

visitor->trace(m_webglCompressedTextureASTC);

@@ -151,7 +151,7 @@ DEFINE_TRACE(WebGL2RenderingContext) {

DEFINE_TRACE_WRAPPERS(WebGL2RenderingContext) {

visitor->traceWrappers(m_extColorBufferFloat);

- visitor->traceWrappers(m_extDisjointTimerQuery);

+ visitor->traceWrappers(m_extDisjointTimerQueryWebGL2);

visitor->traceWrappers(m_extTextureFilterAnisotropic);

visitor->traceWrappers(m_oesTextureFloatLinear);

visitor->traceWrappers(m_webglCompressedTextureASTC);