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

Side by Side Diff: Source/core/html/canvas/WebGLCompressedTextureS3TC.cpp

Issue 24096029: Moved the majority of WebGL functionality into WebGLRenderingContextBase (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed typo in gypi, was only causing issues on Windows (?!?) Created 6 years, 10 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 17 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "core/html/canvas/WebGLCompressedTextureS3TC.h" 28 #include "core/html/canvas/WebGLCompressedTextureS3TC.h"
29 29
30 #include "core/html/canvas/WebGLRenderingContext.h" 30 #include "core/html/canvas/WebGLRenderingContextBase.h"
31 31
32 namespace WebCore { 32 namespace WebCore {
33 33
34 WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC(WebGLRenderingContext* co ntext) 34 WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC(WebGLRenderingContextBase * context)
35 : WebGLExtension(context) 35 : WebGLExtension(context)
36 { 36 {
37 ScriptWrappable::init(this); 37 ScriptWrappable::init(this);
38 context->addCompressedTextureFormat(GL_COMPRESSED_RGB_S3TC_DXT1_EXT); 38 context->addCompressedTextureFormat(GL_COMPRESSED_RGB_S3TC_DXT1_EXT);
39 context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT); 39 context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT);
40 context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT); 40 context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT3_EXT);
41 context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT); 41 context->addCompressedTextureFormat(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
42 } 42 }
43 43
44 WebGLCompressedTextureS3TC::~WebGLCompressedTextureS3TC() 44 WebGLCompressedTextureS3TC::~WebGLCompressedTextureS3TC()
45 { 45 {
46 } 46 }
47 47
48 WebGLExtension::ExtensionName WebGLCompressedTextureS3TC::name() const 48 WebGLExtensionName WebGLCompressedTextureS3TC::name() const
49 { 49 {
50 return WebGLCompressedTextureS3TCName; 50 return WebGLCompressedTextureS3TCName;
51 } 51 }
52 52
53 PassRefPtr<WebGLCompressedTextureS3TC> WebGLCompressedTextureS3TC::create(WebGLR enderingContext* context) 53 PassRefPtr<WebGLCompressedTextureS3TC> WebGLCompressedTextureS3TC::create(WebGLR enderingContextBase* context)
54 { 54 {
55 return adoptRef(new WebGLCompressedTextureS3TC(context)); 55 return adoptRef(new WebGLCompressedTextureS3TC(context));
56 } 56 }
57 57
58 bool WebGLCompressedTextureS3TC::supported(WebGLRenderingContext* context) 58 bool WebGLCompressedTextureS3TC::supported(WebGLRenderingContextBase* context)
59 { 59 {
60 Extensions3DUtil* extensionsUtil = context->extensionsUtil(); 60 Extensions3DUtil* extensionsUtil = context->extensionsUtil();
61 return extensionsUtil->supportsExtension("GL_EXT_texture_compression_s3tc") 61 return extensionsUtil->supportsExtension("GL_EXT_texture_compression_s3tc")
62 || (extensionsUtil->supportsExtension("GL_EXT_texture_compression_dxt1") 62 || (extensionsUtil->supportsExtension("GL_EXT_texture_compression_dxt1")
63 && extensionsUtil->supportsExtension("GL_CHROMIUM_texture_compressio n_dxt3") 63 && extensionsUtil->supportsExtension("GL_CHROMIUM_texture_compressio n_dxt3")
64 && extensionsUtil->supportsExtension("GL_CHROMIUM_texture_compressio n_dxt5")); 64 && extensionsUtil->supportsExtension("GL_CHROMIUM_texture_compressio n_dxt5"));
65 } 65 }
66 66
67 const char* WebGLCompressedTextureS3TC::extensionName() 67 const char* WebGLCompressedTextureS3TC::extensionName()
68 { 68 {
69 return "WEBGL_compressed_texture_s3tc"; 69 return "WEBGL_compressed_texture_s3tc";
70 } 70 }
71 71
72 } // namespace WebCore 72 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698