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

Side by Side Diff: Source/modules/webgl/WebGLRenderingContext.cpp

Issue 1325453007: Added support for EXTDisjointTimerQuery on the Blink side. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: GL_INVALID_ENUM when timer query not enabled for GetParameter, use context3d for deletion Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 16 matching lines...) Expand all
27 #include "modules/webgl/WebGLRenderingContext.h" 27 #include "modules/webgl/WebGLRenderingContext.h"
28 28
29 #include "core/frame/LocalFrame.h" 29 #include "core/frame/LocalFrame.h"
30 #include "core/frame/Settings.h" 30 #include "core/frame/Settings.h"
31 #include "core/layout/LayoutBox.h" 31 #include "core/layout/LayoutBox.h"
32 #include "core/loader/FrameLoader.h" 32 #include "core/loader/FrameLoader.h"
33 #include "core/loader/FrameLoaderClient.h" 33 #include "core/loader/FrameLoaderClient.h"
34 #include "modules/webgl/ANGLEInstancedArrays.h" 34 #include "modules/webgl/ANGLEInstancedArrays.h"
35 #include "modules/webgl/CHROMIUMSubscribeUniform.h" 35 #include "modules/webgl/CHROMIUMSubscribeUniform.h"
36 #include "modules/webgl/EXTBlendMinMax.h" 36 #include "modules/webgl/EXTBlendMinMax.h"
37 #include "modules/webgl/EXTDisjointTimerQuery.h"
37 #include "modules/webgl/EXTFragDepth.h" 38 #include "modules/webgl/EXTFragDepth.h"
38 #include "modules/webgl/EXTShaderTextureLOD.h" 39 #include "modules/webgl/EXTShaderTextureLOD.h"
39 #include "modules/webgl/EXTTextureFilterAnisotropic.h" 40 #include "modules/webgl/EXTTextureFilterAnisotropic.h"
40 #include "modules/webgl/EXTsRGB.h" 41 #include "modules/webgl/EXTsRGB.h"
41 #include "modules/webgl/OESElementIndexUint.h" 42 #include "modules/webgl/OESElementIndexUint.h"
42 #include "modules/webgl/OESStandardDerivatives.h" 43 #include "modules/webgl/OESStandardDerivatives.h"
43 #include "modules/webgl/OESTextureFloat.h" 44 #include "modules/webgl/OESTextureFloat.h"
44 #include "modules/webgl/OESTextureFloatLinear.h" 45 #include "modules/webgl/OESTextureFloatLinear.h"
45 #include "modules/webgl/OESTextureHalfFloat.h" 46 #include "modules/webgl/OESTextureHalfFloat.h"
46 #include "modules/webgl/OESTextureHalfFloatLinear.h" 47 #include "modules/webgl/OESTextureHalfFloatLinear.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 106 }
106 107
107 void WebGLRenderingContext::registerContextExtensions() 108 void WebGLRenderingContext::registerContextExtensions()
108 { 109 {
109 // Register extensions. 110 // Register extensions.
110 static const char* const bothPrefixes[] = { "", "WEBKIT_", 0, }; 111 static const char* const bothPrefixes[] = { "", "WEBKIT_", 0, };
111 112
112 registerExtension<ANGLEInstancedArrays>(m_angleInstancedArrays); 113 registerExtension<ANGLEInstancedArrays>(m_angleInstancedArrays);
113 registerExtension<CHROMIUMSubscribeUniform>(m_chromiumSubscribeUniform); 114 registerExtension<CHROMIUMSubscribeUniform>(m_chromiumSubscribeUniform);
114 registerExtension<EXTBlendMinMax>(m_extBlendMinMax); 115 registerExtension<EXTBlendMinMax>(m_extBlendMinMax);
116 registerExtension<EXTDisjointTimerQuery>(m_extDisjointTimerQuery, DraftExten sion);
115 registerExtension<EXTFragDepth>(m_extFragDepth); 117 registerExtension<EXTFragDepth>(m_extFragDepth);
116 registerExtension<EXTShaderTextureLOD>(m_extShaderTextureLOD); 118 registerExtension<EXTShaderTextureLOD>(m_extShaderTextureLOD);
117 registerExtension<EXTsRGB>(m_extsRGB); 119 registerExtension<EXTsRGB>(m_extsRGB);
118 registerExtension<EXTTextureFilterAnisotropic>(m_extTextureFilterAnisotropic , ApprovedExtension, bothPrefixes); 120 registerExtension<EXTTextureFilterAnisotropic>(m_extTextureFilterAnisotropic , ApprovedExtension, bothPrefixes);
119 registerExtension<OESElementIndexUint>(m_oesElementIndexUint); 121 registerExtension<OESElementIndexUint>(m_oesElementIndexUint);
120 registerExtension<OESStandardDerivatives>(m_oesStandardDerivatives); 122 registerExtension<OESStandardDerivatives>(m_oesStandardDerivatives);
121 registerExtension<OESTextureFloat>(m_oesTextureFloat); 123 registerExtension<OESTextureFloat>(m_oesTextureFloat);
122 registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear); 124 registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear);
123 registerExtension<OESTextureHalfFloat>(m_oesTextureHalfFloat); 125 registerExtension<OESTextureHalfFloat>(m_oesTextureHalfFloat);
124 registerExtension<OESTextureHalfFloatLinear>(m_oesTextureHalfFloatLinear); 126 registerExtension<OESTextureHalfFloatLinear>(m_oesTextureHalfFloatLinear);
125 registerExtension<OESVertexArrayObject>(m_oesVertexArrayObject); 127 registerExtension<OESVertexArrayObject>(m_oesVertexArrayObject);
126 registerExtension<WebGLCompressedTextureASTC>(m_webglCompressedTextureASTC, DraftExtension); 128 registerExtension<WebGLCompressedTextureASTC>(m_webglCompressedTextureASTC, DraftExtension);
127 registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC, Ap provedExtension, bothPrefixes); 129 registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC, Ap provedExtension, bothPrefixes);
128 registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1); 130 registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1);
129 registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC , ApprovedExtension, bothPrefixes); 131 registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC , ApprovedExtension, bothPrefixes);
130 registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC, ApprovedExtension, bothPrefixes); 132 registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC, ApprovedExtension, bothPrefixes);
131 registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo); 133 registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo);
132 registerExtension<WebGLDebugShaders>(m_webglDebugShaders); 134 registerExtension<WebGLDebugShaders>(m_webglDebugShaders);
133 registerExtension<WebGLDepthTexture>(m_webglDepthTexture, ApprovedExtension, bothPrefixes); 135 registerExtension<WebGLDepthTexture>(m_webglDepthTexture, ApprovedExtension, bothPrefixes);
134 registerExtension<WebGLDrawBuffers>(m_webglDrawBuffers); 136 registerExtension<WebGLDrawBuffers>(m_webglDrawBuffers);
135 registerExtension<WebGLLoseContext>(m_webglLoseContext, ApprovedExtension, b othPrefixes); 137 registerExtension<WebGLLoseContext>(m_webglLoseContext, ApprovedExtension, b othPrefixes);
136 } 138 }
137 139
138 DEFINE_TRACE(WebGLRenderingContext) 140 DEFINE_TRACE(WebGLRenderingContext)
139 { 141 {
140 visitor->trace(m_angleInstancedArrays); 142 visitor->trace(m_angleInstancedArrays);
141 visitor->trace(m_chromiumSubscribeUniform); 143 visitor->trace(m_chromiumSubscribeUniform);
142 visitor->trace(m_extBlendMinMax); 144 visitor->trace(m_extBlendMinMax);
145 visitor->trace(m_extDisjointTimerQuery);
143 visitor->trace(m_extFragDepth); 146 visitor->trace(m_extFragDepth);
144 visitor->trace(m_extShaderTextureLOD); 147 visitor->trace(m_extShaderTextureLOD);
145 visitor->trace(m_extsRGB); 148 visitor->trace(m_extsRGB);
146 visitor->trace(m_extTextureFilterAnisotropic); 149 visitor->trace(m_extTextureFilterAnisotropic);
147 visitor->trace(m_oesTextureFloat); 150 visitor->trace(m_oesTextureFloat);
148 visitor->trace(m_oesTextureFloatLinear); 151 visitor->trace(m_oesTextureFloatLinear);
149 visitor->trace(m_oesTextureHalfFloat); 152 visitor->trace(m_oesTextureHalfFloat);
150 visitor->trace(m_oesTextureHalfFloatLinear); 153 visitor->trace(m_oesTextureHalfFloatLinear);
151 visitor->trace(m_oesStandardDerivatives); 154 visitor->trace(m_oesStandardDerivatives);
152 visitor->trace(m_oesVertexArrayObject); 155 visitor->trace(m_oesVertexArrayObject);
153 visitor->trace(m_oesElementIndexUint); 156 visitor->trace(m_oesElementIndexUint);
154 visitor->trace(m_webglLoseContext); 157 visitor->trace(m_webglLoseContext);
155 visitor->trace(m_webglDebugRendererInfo); 158 visitor->trace(m_webglDebugRendererInfo);
156 visitor->trace(m_webglDebugShaders); 159 visitor->trace(m_webglDebugShaders);
157 visitor->trace(m_webglDrawBuffers); 160 visitor->trace(m_webglDrawBuffers);
158 visitor->trace(m_webglCompressedTextureASTC); 161 visitor->trace(m_webglCompressedTextureASTC);
159 visitor->trace(m_webglCompressedTextureATC); 162 visitor->trace(m_webglCompressedTextureATC);
160 visitor->trace(m_webglCompressedTextureETC1); 163 visitor->trace(m_webglCompressedTextureETC1);
161 visitor->trace(m_webglCompressedTexturePVRTC); 164 visitor->trace(m_webglCompressedTexturePVRTC);
162 visitor->trace(m_webglCompressedTextureS3TC); 165 visitor->trace(m_webglCompressedTextureS3TC);
163 visitor->trace(m_webglDepthTexture); 166 visitor->trace(m_webglDepthTexture);
164 WebGLRenderingContextBase::trace(visitor); 167 WebGLRenderingContextBase::trace(visitor);
165 } 168 }
166 169
167 } // namespace blink 170 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/webgl/WebGLRenderingContext.h ('k') | Source/modules/webgl/WebGLRenderingContextBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698