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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/modules/webgl/WebGLRenderingContext.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: Clean and Remove unnecessary enum. Created 5 years, 4 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
« Source/modules/webgl/WebGLRenderingContext.h ('K') | « Source/modules/webgl/WebGLRenderingContext.h ('k') | Source/modules/webgl/WebGLRenderingContextBase.h » ('j') | Source/modules/webgl/WebGLRenderingContextBase.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 27 matching lines...) Expand all
38 #include "modules/webgl/EXTShaderTextureLOD.h" 38 #include "modules/webgl/EXTShaderTextureLOD.h"
39 #include "modules/webgl/EXTTextureFilterAnisotropic.h" 39 #include "modules/webgl/EXTTextureFilterAnisotropic.h"
40 #include "modules/webgl/EXTsRGB.h" 40 #include "modules/webgl/EXTsRGB.h"
41 #include "modules/webgl/OESElementIndexUint.h" 41 #include "modules/webgl/OESElementIndexUint.h"
42 #include "modules/webgl/OESStandardDerivatives.h" 42 #include "modules/webgl/OESStandardDerivatives.h"
43 #include "modules/webgl/OESTextureFloat.h" 43 #include "modules/webgl/OESTextureFloat.h"
44 #include "modules/webgl/OESTextureFloatLinear.h" 44 #include "modules/webgl/OESTextureFloatLinear.h"
45 #include "modules/webgl/OESTextureHalfFloat.h" 45 #include "modules/webgl/OESTextureHalfFloat.h"
46 #include "modules/webgl/OESTextureHalfFloatLinear.h" 46 #include "modules/webgl/OESTextureHalfFloatLinear.h"
47 #include "modules/webgl/OESVertexArrayObject.h" 47 #include "modules/webgl/OESVertexArrayObject.h"
48 #include "modules/webgl/WebGLCompressedTextureASTC.h"
48 #include "modules/webgl/WebGLCompressedTextureATC.h" 49 #include "modules/webgl/WebGLCompressedTextureATC.h"
49 #include "modules/webgl/WebGLCompressedTextureETC1.h" 50 #include "modules/webgl/WebGLCompressedTextureETC1.h"
50 #include "modules/webgl/WebGLCompressedTexturePVRTC.h" 51 #include "modules/webgl/WebGLCompressedTexturePVRTC.h"
51 #include "modules/webgl/WebGLCompressedTextureS3TC.h" 52 #include "modules/webgl/WebGLCompressedTextureS3TC.h"
52 #include "modules/webgl/WebGLContextAttributeHelpers.h" 53 #include "modules/webgl/WebGLContextAttributeHelpers.h"
53 #include "modules/webgl/WebGLContextEvent.h" 54 #include "modules/webgl/WebGLContextEvent.h"
54 #include "modules/webgl/WebGLDebugRendererInfo.h" 55 #include "modules/webgl/WebGLDebugRendererInfo.h"
55 #include "modules/webgl/WebGLDebugShaders.h" 56 #include "modules/webgl/WebGLDebugShaders.h"
56 #include "modules/webgl/WebGLDepthTexture.h" 57 #include "modules/webgl/WebGLDepthTexture.h"
57 #include "modules/webgl/WebGLDrawBuffers.h" 58 #include "modules/webgl/WebGLDrawBuffers.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 registerExtension<EXTShaderTextureLOD>(m_extShaderTextureLOD); 116 registerExtension<EXTShaderTextureLOD>(m_extShaderTextureLOD);
116 registerExtension<EXTsRGB>(m_extsRGB); 117 registerExtension<EXTsRGB>(m_extsRGB);
117 registerExtension<EXTTextureFilterAnisotropic>(m_extTextureFilterAnisotropic , ApprovedExtension, bothPrefixes); 118 registerExtension<EXTTextureFilterAnisotropic>(m_extTextureFilterAnisotropic , ApprovedExtension, bothPrefixes);
118 registerExtension<OESElementIndexUint>(m_oesElementIndexUint); 119 registerExtension<OESElementIndexUint>(m_oesElementIndexUint);
119 registerExtension<OESStandardDerivatives>(m_oesStandardDerivatives); 120 registerExtension<OESStandardDerivatives>(m_oesStandardDerivatives);
120 registerExtension<OESTextureFloat>(m_oesTextureFloat); 121 registerExtension<OESTextureFloat>(m_oesTextureFloat);
121 registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear); 122 registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear);
122 registerExtension<OESTextureHalfFloat>(m_oesTextureHalfFloat); 123 registerExtension<OESTextureHalfFloat>(m_oesTextureHalfFloat);
123 registerExtension<OESTextureHalfFloatLinear>(m_oesTextureHalfFloatLinear); 124 registerExtension<OESTextureHalfFloatLinear>(m_oesTextureHalfFloatLinear);
124 registerExtension<OESVertexArrayObject>(m_oesVertexArrayObject); 125 registerExtension<OESVertexArrayObject>(m_oesVertexArrayObject);
126 registerExtension<WebGLCompressedTextureASTC>(m_webglCompressedTextureASTC);
Ken Russell (switch to Gerrit) 2015/08/18 00:05:03 This must be: registerExtension<WebGLCompressedT
125 registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC, Ap provedExtension, bothPrefixes); 127 registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC, Ap provedExtension, bothPrefixes);
126 registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1); 128 registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1);
127 registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC , ApprovedExtension, bothPrefixes); 129 registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC , ApprovedExtension, bothPrefixes);
128 registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC, ApprovedExtension, bothPrefixes); 130 registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC, ApprovedExtension, bothPrefixes);
129 registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo); 131 registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo);
130 registerExtension<WebGLDebugShaders>(m_webglDebugShaders); 132 registerExtension<WebGLDebugShaders>(m_webglDebugShaders);
131 registerExtension<WebGLDepthTexture>(m_webglDepthTexture, ApprovedExtension, bothPrefixes); 133 registerExtension<WebGLDepthTexture>(m_webglDepthTexture, ApprovedExtension, bothPrefixes);
132 registerExtension<WebGLDrawBuffers>(m_webglDrawBuffers); 134 registerExtension<WebGLDrawBuffers>(m_webglDrawBuffers);
133 registerExtension<WebGLLoseContext>(m_webglLoseContext, ApprovedExtension, b othPrefixes); 135 registerExtension<WebGLLoseContext>(m_webglLoseContext, ApprovedExtension, b othPrefixes);
134 } 136 }
(...skipping 11 matching lines...) Expand all
146 visitor->trace(m_oesTextureFloatLinear); 148 visitor->trace(m_oesTextureFloatLinear);
147 visitor->trace(m_oesTextureHalfFloat); 149 visitor->trace(m_oesTextureHalfFloat);
148 visitor->trace(m_oesTextureHalfFloatLinear); 150 visitor->trace(m_oesTextureHalfFloatLinear);
149 visitor->trace(m_oesStandardDerivatives); 151 visitor->trace(m_oesStandardDerivatives);
150 visitor->trace(m_oesVertexArrayObject); 152 visitor->trace(m_oesVertexArrayObject);
151 visitor->trace(m_oesElementIndexUint); 153 visitor->trace(m_oesElementIndexUint);
152 visitor->trace(m_webglLoseContext); 154 visitor->trace(m_webglLoseContext);
153 visitor->trace(m_webglDebugRendererInfo); 155 visitor->trace(m_webglDebugRendererInfo);
154 visitor->trace(m_webglDebugShaders); 156 visitor->trace(m_webglDebugShaders);
155 visitor->trace(m_webglDrawBuffers); 157 visitor->trace(m_webglDrawBuffers);
158 visitor->trace(m_webglCompressedTextureASTC);
156 visitor->trace(m_webglCompressedTextureATC); 159 visitor->trace(m_webglCompressedTextureATC);
157 visitor->trace(m_webglCompressedTextureETC1); 160 visitor->trace(m_webglCompressedTextureETC1);
158 visitor->trace(m_webglCompressedTexturePVRTC); 161 visitor->trace(m_webglCompressedTexturePVRTC);
159 visitor->trace(m_webglCompressedTextureS3TC); 162 visitor->trace(m_webglCompressedTextureS3TC);
160 visitor->trace(m_webglDepthTexture); 163 visitor->trace(m_webglDepthTexture);
161 WebGLRenderingContextBase::trace(visitor); 164 WebGLRenderingContextBase::trace(visitor);
162 } 165 }
163 166
164 } // namespace blink 167 } // namespace blink
OLDNEW
« Source/modules/webgl/WebGLRenderingContext.h ('K') | « Source/modules/webgl/WebGLRenderingContext.h ('k') | Source/modules/webgl/WebGLRenderingContextBase.h » ('j') | Source/modules/webgl/WebGLRenderingContextBase.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698