Changeset 266364 in webkit


Ignore:
Timestamp:
Aug 31, 2020 11:59:08 AM (4 years ago)
Author:
commit-queue@webkit.org
Message:

Implement WEBGL_compressed_texture_s3tc_srgb extension
​https://bugs.webkit.org/show_bug.cgi?id=215973

Patch by James Darpinian <James Darpinian> on 2020-08-31
Reviewed by Dean Jackson.

Source/ThirdParty/ANGLE:

  • src/libANGLE/renderer/gl/formatutilsgl.cpp:

(rx::nativegl::ExtAndVersionOrExt):
(rx::nativegl::BuildInternalFormatInfoMap):

Source/WebCore:

Tested by webgl/2.0.0/conformance/extensions/webgl-compressed-texture-s3tc-srgb.html

  • CMakeLists.txt:
  • DerivedSources.make:
  • Sources.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSDOMConvertWebGL.cpp:

(WebCore::convertToJSValue):

  • html/canvas/WebGLCompressedTextureS3TCsRGB.cpp: Added.

(WebCore::WebGLCompressedTextureS3TCsRGB::WebGLCompressedTextureS3TCsRGB):
(WebCore::WebGLCompressedTextureS3TCsRGB::getName const):
(WebCore::WebGLCompressedTextureS3TCsRGB::supported):

  • html/canvas/WebGLCompressedTextureS3TCsRGB.h: Added.
  • html/canvas/WebGLCompressedTextureS3TCsRGB.idl: Added.
  • html/canvas/WebGLExtension.h:
  • html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::getExtension):
(WebCore::WebGLRenderingContext::getSupportedExtensions):

  • html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::extensionIsEnabled):
(WebCore::WebGLRenderingContextBase::validateCompressedTexFuncData):
(WebCore::WebGLRenderingContextBase::validateCompressedTexDimensions):
(WebCore::WebGLRenderingContextBase::validateCompressedTexSubDimensions):

  • html/canvas/WebGLRenderingContextBase.h:
  • platform/graphics/ExtensionsGL.h:
Location:
trunk/Source
Files:
3 added
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r265602 r266364  
     12020-08-31  James Darpinian  <jdarpinian@chromium.org>
     2
     3        Implement WEBGL_compressed_texture_s3tc_srgb extension
     4        https://bugs.webkit.org/show_bug.cgi?id=215973
     5
     6        Reviewed by Dean Jackson.
     7
     8        * src/libANGLE/renderer/gl/formatutilsgl.cpp:
     9        (rx::nativegl::ExtAndVersionOrExt):
     10        (rx::nativegl::BuildInternalFormatInfoMap):
     11
    1122020-08-12  Keith Rollin  <krollin@apple.com>
    213

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp

    r265064 r266364  
    4848    requirement.version.minor = minor;
    4949    angle::SplitStringAlongWhitespace(versionExt, &requirement.versionExtensions);
     50    return requirement;
     51}
     52
     53// supported = requiredExt && (version || requiredWithoutVersionExt)
     54static inline SupportRequirement ExtAndVersionOrExt(const std::string &requiredExt,
     55                                                    GLuint major,
     56                                                    GLuint minor,
     57                                                    const std::string &requiredWithoutVersionExt)
     58{
     59    SupportRequirement requirement;
     60    requirement.requiredExtensions.resize(1);
     61    angle::SplitStringAlongWhitespace(requiredExt, &requirement.requiredExtensions[0]);
     62    requirement.version.major = major;
     63    requirement.version.minor = minor;
     64    angle::SplitStringAlongWhitespace(requiredWithoutVersionExt, &requirement.versionExtensions);
    5065    return requirement;
    5166}
    … …  
    326341
    327342    // From GL_EXT_texture_compression_s3tc_srgb
    328     //                       | Format                                | OpenGL texture support                                         | Filter           | Render          | OpenGL ES texture support                                                                             | Filter           | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
    329     InsertFormatMapping(&map, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,       ExtsOnly("GL_EXT_texture_compression_s3tc GL_EXT_texture_sRGB"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc GL_NV_sRGB_formats"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
    330     InsertFormatMapping(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, ExtsOnly("GL_EXT_texture_compression_s3tc GL_EXT_texture_sRGB"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc GL_NV_sRGB_formats"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
    331     InsertFormatMapping(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, ExtsOnly("GL_EXT_texture_compression_s3tc GL_EXT_texture_sRGB"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc GL_NV_sRGB_formats"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
    332     InsertFormatMapping(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, ExtsOnly("GL_EXT_texture_compression_s3tc GL_EXT_texture_sRGB"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc GL_NV_sRGB_formats"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
     343    //                       | Format                                | OpenGL texture support                                                            | Filter           | Render          | OpenGL ES texture support                                                                             | Filter           | OpenGL ES texture attachment support | OpenGL ES renderbuffer support |
     344    InsertFormatMapping(&map, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,       ExtAndVersionOrExt("GL_EXT_texture_compression_s3tc", 2, 1, "GL_EXT_texture_sRGB"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc GL_NV_sRGB_formats"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
     345    InsertFormatMapping(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, ExtAndVersionOrExt("GL_EXT_texture_compression_s3tc", 2, 1, "GL_EXT_texture_sRGB"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc GL_NV_sRGB_formats"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
     346    InsertFormatMapping(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT, ExtAndVersionOrExt("GL_EXT_texture_compression_s3tc", 2, 1, "GL_EXT_texture_sRGB"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc GL_NV_sRGB_formats"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
     347    InsertFormatMapping(&map, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, ExtAndVersionOrExt("GL_EXT_texture_compression_s3tc", 2, 1, "GL_EXT_texture_sRGB"), AlwaysSupported(), NeverSupported(), ExtsOnly("GL_EXT_texture_compression_s3tc_srgb", "GL_EXT_texture_compression_s3tc GL_NV_sRGB_formats"), AlwaysSupported(), NeverSupported(),                      NeverSupported()                );
    333348
    334349    // From GL_OES_compressed_ETC1_RGB8_texture

  • trunk/Source/WebCore/CMakeLists.txt

    r266348 r266364  
    14311431        html/canvas/WebGLCompressedTexturePVRTC.cpp
    14321432        html/canvas/WebGLCompressedTextureS3TC.cpp
     1433        html/canvas/WebGLCompressedTextureS3TCsRGB.cpp
    14331434        html/canvas/WebGLContextEvent.cpp
    14341435        html/canvas/WebGLContextGroup.cpp
    … …  
    14871488    html/canvas/WebGLCompressedTexturePVRTC.idl
    14881489    html/canvas/WebGLCompressedTextureS3TC.idl
     1490    html/canvas/WebGLCompressedTextureS3TCsRGB.idl
    14891491    html/canvas/WebGLContextAttributes.idl
    14901492    html/canvas/WebGLContextEvent.idl

  • trunk/Source/WebCore/ChangeLog

    r266363 r266364  
     12020-08-31  James Darpinian  <jdarpinian@chromium.org>
     2
     3        Implement WEBGL_compressed_texture_s3tc_srgb extension
     4        https://bugs.webkit.org/show_bug.cgi?id=215973
     5
     6        Reviewed by Dean Jackson.
     7
     8        Tested by webgl/2.0.0/conformance/extensions/webgl-compressed-texture-s3tc-srgb.html
     9
     10        * CMakeLists.txt:
     11        * DerivedSources.make:
     12        * Sources.txt:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * bindings/js/JSDOMConvertWebGL.cpp:
     15        (WebCore::convertToJSValue):
     16        * html/canvas/WebGLCompressedTextureS3TCsRGB.cpp: Added.
     17        (WebCore::WebGLCompressedTextureS3TCsRGB::WebGLCompressedTextureS3TCsRGB):
     18        (WebCore::WebGLCompressedTextureS3TCsRGB::getName const):
     19        (WebCore::WebGLCompressedTextureS3TCsRGB::supported):
     20        * html/canvas/WebGLCompressedTextureS3TCsRGB.h: Added.
     21        * html/canvas/WebGLCompressedTextureS3TCsRGB.idl: Added.
     22        * html/canvas/WebGLExtension.h:
     23        * html/canvas/WebGLRenderingContext.cpp:
     24        (WebCore::WebGLRenderingContext::getExtension):
     25        (WebCore::WebGLRenderingContext::getSupportedExtensions):
     26        * html/canvas/WebGLRenderingContextBase.cpp:
     27        (WebCore::WebGLRenderingContextBase::extensionIsEnabled):
     28        (WebCore::WebGLRenderingContextBase::validateCompressedTexFuncData):
     29        (WebCore::WebGLRenderingContextBase::validateCompressedTexDimensions):
     30        (WebCore::WebGLRenderingContextBase::validateCompressedTexSubDimensions):
     31        * html/canvas/WebGLRenderingContextBase.h:
     32        * platform/graphics/ExtensionsGL.h:
     33
    1342020-08-31  Antti Koivisto  <antti@apple.com>
    235

  • trunk/Source/WebCore/DerivedSources.make

    r266348 r266364  
    948948    $(WebCore)/html/canvas/WebGLCompressedTexturePVRTC.idl \
    949949    $(WebCore)/html/canvas/WebGLCompressedTextureS3TC.idl \
     950    $(WebCore)/html/canvas/WebGLCompressedTextureS3TCsRGB.idl \
    950951    $(WebCore)/html/canvas/WebGLContextAttributes.idl \
    951952    $(WebCore)/html/canvas/WebGLContextEvent.idl \

  • trunk/Source/WebCore/Sources.txt

    r266351 r266364  
    12641264html/canvas/WebGLCompressedTexturePVRTC.cpp
    12651265html/canvas/WebGLCompressedTextureS3TC.cpp
     1266html/canvas/WebGLCompressedTextureS3TCsRGB.cpp
    12661267html/canvas/WebGLContextEvent.cpp
    12671268html/canvas/WebGLContextGroup.cpp
    … …  
    35533554JSWebGLCompressedTexturePVRTC.cpp
    35543555JSWebGLCompressedTextureS3TC.cpp
     3556JSWebGLCompressedTextureS3TCsRGB.cpp
    35553557JSWebGLContextAttributes.cpp
    35563558JSWebGLContextEvent.cpp

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r266360 r266364  
    1199711997                A31C4E5316E02B40002F7957 /* JSOESTextureHalfFloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOESTextureHalfFloat.h; sourceTree = "<group>"; };
    1199811998                A334BD822194E4610000D77F /* SSLKeyGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SSLKeyGenerator.cpp; sourceTree = "<group>"; };
     11999                A33C9F9124F835AA000F0845 /* WebGLCompressedTextureS3TCsRGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGLCompressedTextureS3TCsRGB.h; sourceTree = "<group>"; };
     12000                A33C9F9324F835AB000F0845 /* WebGLCompressedTextureS3TCsRGB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGLCompressedTextureS3TCsRGB.cpp; sourceTree = "<group>"; };
     12001                A33C9F9424F835AB000F0845 /* WebGLCompressedTextureS3TCsRGB.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebGLCompressedTextureS3TCsRGB.idl; sourceTree = "<group>"; };
    1199912002                A3AF9D81203252EE006CAD06 /* UserAgentCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UserAgentCocoa.mm; sourceTree = "<group>"; };
    1200012003                A3AF9D8220325324006CAD06 /* UserAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserAgent.h; sourceTree = "<group>"; };
    … …  
    1935119354                                6E3FAE8D14733FDB00E42306 /* WebGLCompressedTextureS3TC.h */,
    1935219355                                6E3FAE9014733FEA00E42306 /* WebGLCompressedTextureS3TC.idl */,
     19356                                A33C9F9324F835AB000F0845 /* WebGLCompressedTextureS3TCsRGB.cpp */,
     19357                                A33C9F9124F835AA000F0845 /* WebGLCompressedTextureS3TCsRGB.h */,
     19358                                A33C9F9424F835AB000F0845 /* WebGLCompressedTextureS3TCsRGB.idl */,
    1935319359                                6E4E91AA10F7FB3100A2779C /* WebGLContextAttributes.h */,
    1935419360                                6E4E91AB10F7FB3100A2779C /* WebGLContextAttributes.idl */,

  • trunk/Source/WebCore/bindings/js/JSDOMConvertWebGL.cpp

    r264988 r266364  
    5353#include "JSWebGLCompressedTexturePVRTC.h"
    5454#include "JSWebGLCompressedTextureS3TC.h"
     55#include "JSWebGLCompressedTextureS3TCsRGB.h"
    5556#include "JSWebGLDebugRendererInfo.h"
    5657#include "JSWebGLDebugShaders.h"
    … …  
    205206    case WebGLExtension::WebGLCompressedTextureS3TCName:
    206207        return toJS(&lexicalGlobalObject, &globalObject, static_cast<WebGLCompressedTextureS3TC&>(extension));
     208    case WebGLExtension::WebGLCompressedTextureS3TCsRGBName:
     209        return toJS(&lexicalGlobalObject, &globalObject, static_cast<WebGLCompressedTextureS3TCsRGB&>(extension));
    207210    case WebGLExtension::WebGLCompressedTextureASTCName:
    208211        return toJS(&lexicalGlobalObject, &globalObject, static_cast<WebGLCompressedTextureASTC&>(extension));

  • trunk/Source/WebCore/html/canvas/WebGLExtension.h

    r265975 r266364  
    5353        WebGLDebugShadersName,
    5454        WebGLCompressedTextureS3TCName,
     55        WebGLCompressedTextureS3TCsRGBName,
    5556        WebGLDepthTextureName,
    5657        WebGLDrawBuffersName,

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r265975 r266364  
    5959#include "WebGLCompressedTexturePVRTC.h"
    6060#include "WebGLCompressedTextureS3TC.h"
     61#include "WebGLCompressedTextureS3TCsRGB.h"
    6162#include "WebGLDebugRendererInfo.h"
    6263#include "WebGLDebugShaders.h"
    … …  
    165166    ENABLE_IF_REQUESTED(WebGLCompressedTexturePVRTC, m_webglCompressedTexturePVRTC, "WEBKIT_WEBGL_compressed_texture_pvrtc", WebGLCompressedTexturePVRTC::supported(*this));
    166167    ENABLE_IF_REQUESTED(WebGLCompressedTextureS3TC, m_webglCompressedTextureS3TC, "WEBGL_compressed_texture_s3tc", WebGLCompressedTextureS3TC::supported(*this));
     168    ENABLE_IF_REQUESTED(WebGLCompressedTextureS3TCsRGB, m_webglCompressedTextureS3TCsRGB, "WEBGL_compressed_texture_s3tc_srgb", WebGLCompressedTextureS3TCsRGB::supported(*this));
    167169    ENABLE_IF_REQUESTED(WebGLDepthTexture, m_webglDepthTexture, "WEBGL_depth_texture", WebGLDepthTexture::supported(*m_context));
    168170    if (equalIgnoringASCIICase(name, "WEBGL_draw_buffers")) {
    … …  
    244246    if (WebGLCompressedTextureS3TC::supported(*this))
    245247        result.append("WEBGL_compressed_texture_s3tc"_s);
     248    if (WebGLCompressedTextureS3TCsRGB::supported(*this))
     249        result.append("WEBGL_compressed_texture_s3tc_srgb"_s);
    246250    if (WebGLDepthTexture::supported(*m_context))
    247251        result.append("WEBGL_depth_texture"_s);

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

    r266275 r266364  
    8282#include "WebGLCompressedTexturePVRTC.h"
    8383#include "WebGLCompressedTextureS3TC.h"
     84#include "WebGLCompressedTextureS3TCsRGB.h"
    8485#include "WebGLContextAttributes.h"
    8586#include "WebGLContextEvent.h"
    … …  
    37323733    CHECK_EXTENSION(m_webglCompressedTexturePVRTC, "WEBKIT_WEBGL_compressed_texture_pvrtc");
    37333734    CHECK_EXTENSION(m_webglCompressedTextureS3TC, "WEBGL_compressed_texture_s3tc");
     3735    CHECK_EXTENSION(m_webglCompressedTextureS3TCsRGB, "WEBGL_compressed_texture_s3tc_srgb");
    37343736    CHECK_EXTENSION(m_webglDepthTexture, "WEBGL_depth_texture");
    37353737    CHECK_EXTENSION(m_webglDrawBuffers, "WEBGL_draw_buffers");
    … …  
    66196621    case ExtensionsGL::COMPRESSED_RGB_S3TC_DXT1_EXT:
    66206622    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT1_EXT:
     6623    case ExtensionsGL::COMPRESSED_SRGB_S3TC_DXT1_EXT:
     6624    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
    66216625    case ExtensionsGL::COMPRESSED_ATC_RGB_AMD:
    66226626    case ExtensionsGL::ETC1_RGB8_OES: {
    … …  
    66316635    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT3_EXT:
    66326636    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT5_EXT:
     6637    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
     6638    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
    66336639    case ExtensionsGL::COMPRESSED_ATC_RGBA_EXPLICIT_ALPHA_AMD:
    66346640    case ExtensionsGL::COMPRESSED_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
    … …  
    67416747    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT1_EXT:
    67426748    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT3_EXT:
    6743     case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT5_EXT: {
     6749    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT5_EXT:
     6750    case ExtensionsGL::COMPRESSED_SRGB_S3TC_DXT1_EXT:
     6751    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
     6752    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
     6753    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: {
    67446754        const GCGLsizei kBlockWidth = 4;
    67456755        const GCGLsizei kBlockHeight = 4;
    … …  
    68216831    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT1_EXT:
    68226832    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT3_EXT:
    6823     case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT5_EXT: {
     6833    case ExtensionsGL::COMPRESSED_RGBA_S3TC_DXT5_EXT:
     6834    case ExtensionsGL::COMPRESSED_SRGB_S3TC_DXT1_EXT:
     6835    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
     6836    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
     6837    case ExtensionsGL::COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: {
    68246838        const int kBlockWidth = 4;
    68256839        const int kBlockHeight = 4;

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h

    r265975 r266364  
    9797class WebGLCompressedTexturePVRTC;
    9898class WebGLCompressedTextureS3TC;
     99class WebGLCompressedTextureS3TCsRGB;
    99100class WebGLContextGroup;
    100101class WebGLContextObject;
    … …  
    439440    friend class WebGLCompressedTexturePVRTC;
    440441    friend class WebGLCompressedTextureS3TC;
     442    friend class WebGLCompressedTextureS3TCsRGB;
    441443    friend class WebGLRenderingContextErrorMessageCallback;
    442444    friend class WebGLVertexArrayObjectOES;
    … …  
    680682    RefPtr<WebGLCompressedTexturePVRTC> m_webglCompressedTexturePVRTC;
    681683    RefPtr<WebGLCompressedTextureS3TC> m_webglCompressedTextureS3TC;
     684    RefPtr<WebGLCompressedTextureS3TCsRGB> m_webglCompressedTextureS3TCsRGB;
    682685    RefPtr<WebGLDepthTexture> m_webglDepthTexture;
    683686    RefPtr<WebGLDrawBuffers> m_webglDrawBuffers;

  • trunk/Source/WebCore/platform/graphics/ExtensionsGL.h

    r264536 r266364  
    6868    //   GL_EXT_texture_compression_dxt1
    6969    //   GL_EXT_texture_compression_s3tc
     70    //   GL_EXT_texture_compression_s3tc_srgb
    7071    //   GL_OES_compressed_ETC1_RGB8_texture
    7172    //   GL_IMG_texture_compression_pvrtc
    … …  
    155156        COMPRESSED_RGBA_S3TC_DXT3_EXT = 0x83F2,
    156157        COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3,
     158
     159        // GL_EXT_texture_compression_s3tc_srgb
     160        COMPRESSED_SRGB_S3TC_DXT1_EXT = 0x8C4C,
     161        COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT = 0x8C4D,
     162        COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT = 0x8C4E,
     163        COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT = 0x8C4F,
    157164
    158165        // GL_OES_compressed_ETC1_RGB8_texture
Note: See TracChangeset for help on using the changeset viewer.