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

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

Issue 1265703005: Implement the texture uploading of ASTC compression for WebGL(part II) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add braces. 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/webgl/WebGL2RenderingContext.h" 6 #include "modules/webgl/WebGL2RenderingContext.h"
7 7
8 #include "core/frame/LocalFrame.h" 8 #include "core/frame/LocalFrame.h"
9 #include "core/frame/Settings.h" 9 #include "core/frame/Settings.h"
10 #include "core/loader/FrameLoader.h" 10 #include "core/loader/FrameLoader.h"
11 #include "core/loader/FrameLoaderClient.h" 11 #include "core/loader/FrameLoaderClient.h"
12 #include "modules/webgl/CHROMIUMSubscribeUniform.h" 12 #include "modules/webgl/CHROMIUMSubscribeUniform.h"
13 #include "modules/webgl/EXTTextureFilterAnisotropic.h" 13 #include "modules/webgl/EXTTextureFilterAnisotropic.h"
14 #include "modules/webgl/OESTextureFloatLinear.h" 14 #include "modules/webgl/OESTextureFloatLinear.h"
15 #include "modules/webgl/WebGLCompressedTextureASTC.h"
15 #include "modules/webgl/WebGLCompressedTextureATC.h" 16 #include "modules/webgl/WebGLCompressedTextureATC.h"
16 #include "modules/webgl/WebGLCompressedTextureETC1.h" 17 #include "modules/webgl/WebGLCompressedTextureETC1.h"
17 #include "modules/webgl/WebGLCompressedTexturePVRTC.h" 18 #include "modules/webgl/WebGLCompressedTexturePVRTC.h"
18 #include "modules/webgl/WebGLCompressedTextureS3TC.h" 19 #include "modules/webgl/WebGLCompressedTextureS3TC.h"
19 #include "modules/webgl/WebGLContextAttributeHelpers.h" 20 #include "modules/webgl/WebGLContextAttributeHelpers.h"
20 #include "modules/webgl/WebGLContextEvent.h" 21 #include "modules/webgl/WebGLContextEvent.h"
21 #include "modules/webgl/WebGLDebugRendererInfo.h" 22 #include "modules/webgl/WebGLDebugRendererInfo.h"
22 #include "modules/webgl/WebGLDebugShaders.h" 23 #include "modules/webgl/WebGLDebugShaders.h"
23 #include "modules/webgl/WebGLLoseContext.h" 24 #include "modules/webgl/WebGLLoseContext.h"
24 #include "platform/graphics/gpu/DrawingBuffer.h" 25 #include "platform/graphics/gpu/DrawingBuffer.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 { 73 {
73 74
74 } 75 }
75 76
76 void WebGL2RenderingContext::registerContextExtensions() 77 void WebGL2RenderingContext::registerContextExtensions()
77 { 78 {
78 // Register extensions. 79 // Register extensions.
79 registerExtension<CHROMIUMSubscribeUniform>(m_chromiumSubscribeUniform); 80 registerExtension<CHROMIUMSubscribeUniform>(m_chromiumSubscribeUniform);
80 registerExtension<EXTTextureFilterAnisotropic>(m_extTextureFilterAnisotropic ); 81 registerExtension<EXTTextureFilterAnisotropic>(m_extTextureFilterAnisotropic );
81 registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear); 82 registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear);
83 registerExtension<WebGLCompressedTextureASTC>(m_webglCompressedTextureASTC);
82 registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC); 84 registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC);
83 registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1); 85 registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1);
84 registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC ); 86 registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC );
85 registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC); 87 registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC);
86 registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo); 88 registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo);
87 registerExtension<WebGLDebugShaders>(m_webglDebugShaders); 89 registerExtension<WebGLDebugShaders>(m_webglDebugShaders);
88 registerExtension<WebGLLoseContext>(m_webglLoseContext); 90 registerExtension<WebGLLoseContext>(m_webglLoseContext);
89 } 91 }
90 92
91 DEFINE_TRACE(WebGL2RenderingContext) 93 DEFINE_TRACE(WebGL2RenderingContext)
92 { 94 {
93 visitor->trace(m_chromiumSubscribeUniform); 95 visitor->trace(m_chromiumSubscribeUniform);
94 visitor->trace(m_extTextureFilterAnisotropic); 96 visitor->trace(m_extTextureFilterAnisotropic);
95 visitor->trace(m_oesTextureFloatLinear); 97 visitor->trace(m_oesTextureFloatLinear);
98 visitor->trace(m_webglCompressedTextureASTC);
96 visitor->trace(m_webglCompressedTextureATC); 99 visitor->trace(m_webglCompressedTextureATC);
97 visitor->trace(m_webglCompressedTextureETC1); 100 visitor->trace(m_webglCompressedTextureETC1);
98 visitor->trace(m_webglCompressedTexturePVRTC); 101 visitor->trace(m_webglCompressedTexturePVRTC);
99 visitor->trace(m_webglCompressedTextureS3TC); 102 visitor->trace(m_webglCompressedTextureS3TC);
100 visitor->trace(m_webglDebugRendererInfo); 103 visitor->trace(m_webglDebugRendererInfo);
101 visitor->trace(m_webglDebugShaders); 104 visitor->trace(m_webglDebugShaders);
102 visitor->trace(m_webglLoseContext); 105 visitor->trace(m_webglLoseContext);
103 WebGL2RenderingContextBase::trace(visitor); 106 WebGL2RenderingContextBase::trace(visitor);
104 } 107 }
105 108
106 } // namespace blink 109 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/webgl/WebGL2RenderingContext.h ('k') | Source/modules/webgl/WebGLCompressedTextureASTC.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698