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

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

Issue 2337833002: Implement WEBGL_compressed_texture_s3tc_srgb (Closed)
Patch Set: replace NV_sRGB_formats with (draft) EXT_texture_compression_s3tc_srgb Created 4 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "modules/webgl/OESTextureFloat.h" 44 #include "modules/webgl/OESTextureFloat.h"
45 #include "modules/webgl/OESTextureFloatLinear.h" 45 #include "modules/webgl/OESTextureFloatLinear.h"
46 #include "modules/webgl/OESTextureHalfFloat.h" 46 #include "modules/webgl/OESTextureHalfFloat.h"
47 #include "modules/webgl/OESTextureHalfFloatLinear.h" 47 #include "modules/webgl/OESTextureHalfFloatLinear.h"
48 #include "modules/webgl/OESVertexArrayObject.h" 48 #include "modules/webgl/OESVertexArrayObject.h"
49 #include "modules/webgl/WebGLCompressedTextureASTC.h" 49 #include "modules/webgl/WebGLCompressedTextureASTC.h"
50 #include "modules/webgl/WebGLCompressedTextureATC.h" 50 #include "modules/webgl/WebGLCompressedTextureATC.h"
51 #include "modules/webgl/WebGLCompressedTextureETC1.h" 51 #include "modules/webgl/WebGLCompressedTextureETC1.h"
52 #include "modules/webgl/WebGLCompressedTexturePVRTC.h" 52 #include "modules/webgl/WebGLCompressedTexturePVRTC.h"
53 #include "modules/webgl/WebGLCompressedTextureS3TC.h" 53 #include "modules/webgl/WebGLCompressedTextureS3TC.h"
54 #include "modules/webgl/WebGLCompressedTextureS3TCsRGB.h"
54 #include "modules/webgl/WebGLContextEvent.h" 55 #include "modules/webgl/WebGLContextEvent.h"
55 #include "modules/webgl/WebGLDebugRendererInfo.h" 56 #include "modules/webgl/WebGLDebugRendererInfo.h"
56 #include "modules/webgl/WebGLDebugShaders.h" 57 #include "modules/webgl/WebGLDebugShaders.h"
57 #include "modules/webgl/WebGLDepthTexture.h" 58 #include "modules/webgl/WebGLDepthTexture.h"
58 #include "modules/webgl/WebGLDrawBuffers.h" 59 #include "modules/webgl/WebGLDrawBuffers.h"
59 #include "modules/webgl/WebGLLoseContext.h" 60 #include "modules/webgl/WebGLLoseContext.h"
60 #include "platform/CheckedInt.h" 61 #include "platform/CheckedInt.h"
61 #include "platform/graphics/gpu/DrawingBuffer.h" 62 #include "platform/graphics/gpu/DrawingBuffer.h"
62 #include "public/platform/Platform.h" 63 #include "public/platform/Platform.h"
63 #include "public/platform/WebGraphicsContext3DProvider.h" 64 #include "public/platform/WebGraphicsContext3DProvider.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 registerExtension<OESTextureFloat>(m_oesTextureFloat); 166 registerExtension<OESTextureFloat>(m_oesTextureFloat);
166 registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear); 167 registerExtension<OESTextureFloatLinear>(m_oesTextureFloatLinear);
167 registerExtension<OESTextureHalfFloat>(m_oesTextureHalfFloat); 168 registerExtension<OESTextureHalfFloat>(m_oesTextureHalfFloat);
168 registerExtension<OESTextureHalfFloatLinear>(m_oesTextureHalfFloatLinear); 169 registerExtension<OESTextureHalfFloatLinear>(m_oesTextureHalfFloatLinear);
169 registerExtension<OESVertexArrayObject>(m_oesVertexArrayObject); 170 registerExtension<OESVertexArrayObject>(m_oesVertexArrayObject);
170 registerExtension<WebGLCompressedTextureASTC>(m_webglCompressedTextureASTC, DraftExtension); 171 registerExtension<WebGLCompressedTextureASTC>(m_webglCompressedTextureASTC, DraftExtension);
171 registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC, Ap provedExtension, bothPrefixes); 172 registerExtension<WebGLCompressedTextureATC>(m_webglCompressedTextureATC, Ap provedExtension, bothPrefixes);
172 registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1); 173 registerExtension<WebGLCompressedTextureETC1>(m_webglCompressedTextureETC1);
173 registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC , ApprovedExtension, bothPrefixes); 174 registerExtension<WebGLCompressedTexturePVRTC>(m_webglCompressedTexturePVRTC , ApprovedExtension, bothPrefixes);
174 registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC, ApprovedExtension, bothPrefixes); 175 registerExtension<WebGLCompressedTextureS3TC>(m_webglCompressedTextureS3TC, ApprovedExtension, bothPrefixes);
176 registerExtension<WebGLCompressedTextureS3TCsRGB>(m_webglCompressedTextureS3 TCsRGB, ApprovedExtension, bothPrefixes);
175 registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo); 177 registerExtension<WebGLDebugRendererInfo>(m_webglDebugRendererInfo);
176 registerExtension<WebGLDebugShaders>(m_webglDebugShaders); 178 registerExtension<WebGLDebugShaders>(m_webglDebugShaders);
177 registerExtension<WebGLDepthTexture>(m_webglDepthTexture, ApprovedExtension, bothPrefixes); 179 registerExtension<WebGLDepthTexture>(m_webglDepthTexture, ApprovedExtension, bothPrefixes);
178 registerExtension<WebGLDrawBuffers>(m_webglDrawBuffers); 180 registerExtension<WebGLDrawBuffers>(m_webglDrawBuffers);
179 registerExtension<WebGLLoseContext>(m_webglLoseContext, ApprovedExtension, b othPrefixes); 181 registerExtension<WebGLLoseContext>(m_webglLoseContext, ApprovedExtension, b othPrefixes);
180 } 182 }
181 183
182 DEFINE_TRACE(WebGLRenderingContext) 184 DEFINE_TRACE(WebGLRenderingContext)
183 { 185 {
184 visitor->trace(m_angleInstancedArrays); 186 visitor->trace(m_angleInstancedArrays);
(...skipping 12 matching lines...) Expand all
197 visitor->trace(m_oesElementIndexUint); 199 visitor->trace(m_oesElementIndexUint);
198 visitor->trace(m_webglLoseContext); 200 visitor->trace(m_webglLoseContext);
199 visitor->trace(m_webglDebugRendererInfo); 201 visitor->trace(m_webglDebugRendererInfo);
200 visitor->trace(m_webglDebugShaders); 202 visitor->trace(m_webglDebugShaders);
201 visitor->trace(m_webglDrawBuffers); 203 visitor->trace(m_webglDrawBuffers);
202 visitor->trace(m_webglCompressedTextureASTC); 204 visitor->trace(m_webglCompressedTextureASTC);
203 visitor->trace(m_webglCompressedTextureATC); 205 visitor->trace(m_webglCompressedTextureATC);
204 visitor->trace(m_webglCompressedTextureETC1); 206 visitor->trace(m_webglCompressedTextureETC1);
205 visitor->trace(m_webglCompressedTexturePVRTC); 207 visitor->trace(m_webglCompressedTexturePVRTC);
206 visitor->trace(m_webglCompressedTextureS3TC); 208 visitor->trace(m_webglCompressedTextureS3TC);
209 visitor->trace(m_webglCompressedTextureS3TCsRGB);
207 visitor->trace(m_webglDepthTexture); 210 visitor->trace(m_webglDepthTexture);
208 WebGLRenderingContextBase::trace(visitor); 211 WebGLRenderingContextBase::trace(visitor);
209 } 212 }
210 213
211 DEFINE_TRACE_WRAPPERS(WebGLRenderingContext) 214 DEFINE_TRACE_WRAPPERS(WebGLRenderingContext)
212 { 215 {
213 visitor->traceWrappers(m_angleInstancedArrays); 216 visitor->traceWrappers(m_angleInstancedArrays);
214 visitor->traceWrappers(m_extBlendMinMax); 217 visitor->traceWrappers(m_extBlendMinMax);
215 visitor->traceWrappers(m_extDisjointTimerQuery); 218 visitor->traceWrappers(m_extDisjointTimerQuery);
216 visitor->traceWrappers(m_extFragDepth); 219 visitor->traceWrappers(m_extFragDepth);
217 visitor->traceWrappers(m_extShaderTextureLOD); 220 visitor->traceWrappers(m_extShaderTextureLOD);
218 visitor->traceWrappers(m_extsRGB); 221 visitor->traceWrappers(m_extsRGB);
219 visitor->traceWrappers(m_extTextureFilterAnisotropic); 222 visitor->traceWrappers(m_extTextureFilterAnisotropic);
220 visitor->traceWrappers(m_oesTextureFloat); 223 visitor->traceWrappers(m_oesTextureFloat);
221 visitor->traceWrappers(m_oesTextureFloatLinear); 224 visitor->traceWrappers(m_oesTextureFloatLinear);
222 visitor->traceWrappers(m_oesTextureHalfFloat); 225 visitor->traceWrappers(m_oesTextureHalfFloat);
223 visitor->traceWrappers(m_oesTextureHalfFloatLinear); 226 visitor->traceWrappers(m_oesTextureHalfFloatLinear);
224 visitor->traceWrappers(m_oesStandardDerivatives); 227 visitor->traceWrappers(m_oesStandardDerivatives);
225 visitor->traceWrappers(m_oesVertexArrayObject); 228 visitor->traceWrappers(m_oesVertexArrayObject);
226 visitor->traceWrappers(m_oesElementIndexUint); 229 visitor->traceWrappers(m_oesElementIndexUint);
227 visitor->traceWrappers(m_webglLoseContext); 230 visitor->traceWrappers(m_webglLoseContext);
228 visitor->traceWrappers(m_webglDebugRendererInfo); 231 visitor->traceWrappers(m_webglDebugRendererInfo);
229 visitor->traceWrappers(m_webglDebugShaders); 232 visitor->traceWrappers(m_webglDebugShaders);
230 visitor->traceWrappers(m_webglDrawBuffers); 233 visitor->traceWrappers(m_webglDrawBuffers);
231 visitor->traceWrappers(m_webglCompressedTextureASTC); 234 visitor->traceWrappers(m_webglCompressedTextureASTC);
232 visitor->traceWrappers(m_webglCompressedTextureATC); 235 visitor->traceWrappers(m_webglCompressedTextureATC);
233 visitor->traceWrappers(m_webglCompressedTextureETC1); 236 visitor->traceWrappers(m_webglCompressedTextureETC1);
234 visitor->traceWrappers(m_webglCompressedTexturePVRTC); 237 visitor->traceWrappers(m_webglCompressedTexturePVRTC);
235 visitor->traceWrappers(m_webglCompressedTextureS3TC); 238 visitor->traceWrappers(m_webglCompressedTextureS3TC);
239 visitor->traceWrappers(m_webglCompressedTextureS3TCsRGB);
236 visitor->traceWrappers(m_webglDepthTexture); 240 visitor->traceWrappers(m_webglDepthTexture);
237 } 241 }
238 } // namespace blink 242 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698