Changeset 262044 in webkit


Ignore:
Timestamp:
May 21, 2020 8:26:30 PM (4 years ago)
Author:
dino@apple.com
Message:

PVRTC compressed textures are failing with ANGLE backend
​https://bugs.webkit.org/show_bug.cgi?id=212240
<rdar://problem/63517385>

Reviewed by Ken Russell (representing ANGLE).

Source/ThirdParty/ANGLE:

The values used for the PVRTC formats were incorrect.

  • src/libANGLE/formatutils.cpp:

(gl::BuildInternalFormatInfoMap):

LayoutTests:

Merge the upstream change to this test.

  • webgl/1.0.3/resources/webgl_test_files/conformance/extensions/webgl-compressed-texture-pvrtc.html:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r262038 r262044  
     12020-05-21  Dean Jackson  <dino@apple.com>
     2
     3        PVRTC compressed textures are failing with ANGLE backend
     4        https://bugs.webkit.org/show_bug.cgi?id=212240
     5        <rdar://problem/63517385>
     6
     7        Reviewed by Ken Russell (representing ANGLE).
     8
     9        Merge the upstream change to this test.
     10
     11        * webgl/1.0.3/resources/webgl_test_files/conformance/extensions/webgl-compressed-texture-pvrtc.html:
     12
    1132020-05-21  Peng Liu  <peng.liu6@apple.com>
    214

  • trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/extensions/webgl-compressed-texture-pvrtc.html

    r176776 r262044  
    272272    gl.generateMipmap(gl.TEXTURE_2D);
    273273    wtu.glErrorShouldBe(gl, gl.INVALID_OPERATION, "trying to generate mipmaps from compressed texture");
    274     wtu.drawQuad(gl);
     274    wtu.clearAndDrawUnitQuad(gl);
    275275    compareRect(width, height, test.channels, width, height, uncompressedData, data, format);
    276276

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r262036 r262044  
     12020-05-21  Dean Jackson  <dino@apple.com>
     2
     3        PVRTC compressed textures are failing with ANGLE backend
     4        https://bugs.webkit.org/show_bug.cgi?id=212240
     5        <rdar://problem/63517385>
     6
     7        Reviewed by Ken Russell (representing ANGLE).
     8
     9        The values used for the PVRTC formats were incorrect.
     10
     11        * src/libANGLE/formatutils.cpp:
     12        (gl::BuildInternalFormatInfoMap):
     13
    1142020-05-21  Kenneth Russell  <kbr@chromium.org>
    215

  • trunk/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp

    r262036 r262044  
    965965    // From GL_IMG_texture_compression_pvrtc
    966966    //                       | Internal format                       | W | H | D | BS |CC| SRGB | Texture supported                                 | Filterable     | Texture attachment | Renderbuffer  | Blend
    967     AddCompressedFormat(&map, GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG,      1,  1,  1,   1, 3, false, RequireExt<&Extensions::compressedTexturePVRTC>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
    968     AddCompressedFormat(&map, GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG,      1,  1,  1,   1, 3, false, RequireExt<&Extensions::compressedTexturePVRTC>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
    969     AddCompressedFormat(&map, GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG,     1,  1,  1,   1, 4, false, RequireExt<&Extensions::compressedTexturePVRTC>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
    970     AddCompressedFormat(&map, GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG,     1,  1,  1,   1, 4, false, RequireExt<&Extensions::compressedTexturePVRTC>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
     967    AddCompressedFormat(&map, GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG,      8,  8,  1, 256, 3, false, RequireExt<&Extensions::compressedTexturePVRTC>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
     968    AddCompressedFormat(&map, GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG,     16,  8,  1, 256, 3, false, RequireExt<&Extensions::compressedTexturePVRTC>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
     969    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG,     8,  8,  1, 256, 4, false, RequireExt<&Extensions::compressedTexturePVRTC>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
     970    AddCompressedFormat(&map, GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG,    16,  8,  1, 256, 4, false, RequireExt<&Extensions::compressedTexturePVRTC>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
    971971
    972972    // From GL_EXT_pvrtc_sRGB
    973973    //                       | Internal format                             | W | H | D | BS |CC| SRGB | Texture supported                                     | Filterable     | Texture attachment | Renderbuffer  | Blend
    974     AddCompressedFormat(&map, GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT,           1,  1,  1,   1, 3, true, RequireExt<&Extensions::compressedTexturePVRTCsRGB>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
    975     AddCompressedFormat(&map, GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT,           1,  1,  1,   1, 3, true, RequireExt<&Extensions::compressedTexturePVRTCsRGB>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
    976     AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT,     1,  1,  1,   1, 4, true, RequireExt<&Extensions::compressedTexturePVRTCsRGB>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
    977     AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT,     1,  1,  1,   1, 4, true, RequireExt<&Extensions::compressedTexturePVRTCsRGB>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
     974    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT,          16,  8,  1, 256,  3, true, RequireExt<&Extensions::compressedTexturePVRTCsRGB>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
     975    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT,           8,  8,  1, 256,  3, true, RequireExt<&Extensions::compressedTexturePVRTCsRGB>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
     976    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT,    16,  8,  1, 256,  4, true, RequireExt<&Extensions::compressedTexturePVRTCsRGB>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
     977    AddCompressedFormat(&map, GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT,     8,  8,  1, 256,  4, true, RequireExt<&Extensions::compressedTexturePVRTCsRGB>,    AlwaysSupported, NeverSupported,      NeverSupported, NeverSupported);
    978978
    979979    // For STENCIL_INDEX8 we chose a normalized component type for the following reasons:
Note: See TracChangeset for help on using the changeset viewer.