diff options
Diffstat (limited to 'Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp')
| -rw-r--r-- | Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp b/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp index bcf1a3267..40b7f53a8 100644 --- a/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp +++ b/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp @@ -30,17 +30,17 @@ #include "WebGLCompressedTextureS3TC.h" #include "Extensions3D.h" -#include "WebGLRenderingContext.h" +#include "WebGLRenderingContextBase.h" namespace WebCore { -WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC(WebGLRenderingContext* context) +WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC(WebGLRenderingContextBase& context) : WebGLExtension(context) { - context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGB_S3TC_DXT1_EXT); - context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT1_EXT); - context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT3_EXT); - context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT5_EXT); + context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGB_S3TC_DXT1_EXT); + context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT1_EXT); + context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT3_EXT); + context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT5_EXT); } WebGLCompressedTextureS3TC::~WebGLCompressedTextureS3TC() @@ -52,18 +52,11 @@ WebGLExtension::ExtensionName WebGLCompressedTextureS3TC::getName() const return WebGLCompressedTextureS3TCName; } -OwnPtr<WebGLCompressedTextureS3TC> WebGLCompressedTextureS3TC::create(WebGLRenderingContext* context) +bool WebGLCompressedTextureS3TC::supported(WebGLRenderingContextBase& context) { - return adoptPtr(new WebGLCompressedTextureS3TC(context)); -} - -bool WebGLCompressedTextureS3TC::supported(WebGLRenderingContext* context) -{ - Extensions3D* extensions = context->graphicsContext3D()->getExtensions(); - return extensions->supports("GL_EXT_texture_compression_s3tc") - || (extensions->supports("GL_EXT_texture_compression_dxt1") - && extensions->supports("GL_CHROMIUM_texture_compression_dxt3") - && extensions->supports("GL_CHROMIUM_texture_compression_dxt5")); + auto& extensions = context.graphicsContext3D()->getExtensions(); + return extensions.supports("GL_EXT_texture_compression_s3tc") + || extensions.supports("GL_EXT_texture_compression_dxt1"); } } // namespace WebCore |