Changeset 287902 in webkit


Ignore:
Timestamp:
Jan 11, 2022, 3:45:13 PM (4 years ago)
Author:
Russell Epstein
Message:

Cherry-pick r287894. rdar://problem/87417913

ANGLE: ASTC-HDR is not available on TVOS
​https://bugs.webkit.org/show_bug.cgi?id=235076

Reviewed by Dean Jackson.

<rdar://87384038>
This is a follow on patch to ​https://bugs.webkit.org/show_bug.cgi?id=234164,
ASTC-HDR is only available on macOS and iOS, not tvOS or watchOS

This patch fixes an internal build.

  • scripts/code_generation_hashes/Metal_format_table.json:
  • src/libANGLE/renderer/metal/gen_mtl_format_table.py: (gen_image_map_switch_astc_case_tv_watchos): (gen_image_map_switch_string): (gen_image_mtl_to_angle_switch_string): (gen_image_map_switch_astc_case_watchos): Deleted. (gen_image_map_switch_astc_case_watchos.gen_format_assign_code): Deleted.
  • src/libANGLE/renderer/metal/mtl_format_table_autogen.mm: (rx::mtl::Format::MetalToAngleFormatID): (rx::mtl::Format::init):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@287894 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:
branches/safari-613-branch/Source/ThirdParty/ANGLE
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-613-branch/Source/ThirdParty/ANGLE/ChangeLog

    r287829 r287902  
     12022-01-11  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r287894. rdar://problem/87417913
     4
     5    ANGLE: ASTC-HDR is not available on TVOS
     6    https://bugs.webkit.org/show_bug.cgi?id=235076
     7   
     8    Reviewed by Dean Jackson.
     9   
     10    <rdar://87384038>
     11    This is a follow on patch to https://bugs.webkit.org/show_bug.cgi?id=234164,
     12    ASTC-HDR is only available on macOS and iOS, not tvOS or watchOS
     13        This patch fixes an internal build.
     14   
     15    * scripts/code_generation_hashes/Metal_format_table.json:
     16    * src/libANGLE/renderer/metal/gen_mtl_format_table.py:
     17    (gen_image_map_switch_astc_case_tv_watchos):
     18    (gen_image_map_switch_string):
     19    (gen_image_mtl_to_angle_switch_string):
     20    (gen_image_map_switch_astc_case_watchos): Deleted.
     21    (gen_image_map_switch_astc_case_watchos.gen_format_assign_code): Deleted.
     22    * src/libANGLE/renderer/metal/mtl_format_table_autogen.mm:
     23    (rx::mtl::Format::MetalToAngleFormatID):
     24    (rx::mtl::Format::init):
     25   
     26   
     27    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287894 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     28
     29    2022-01-11  Kyle Piddington  <kpiddington@apple.com>
     30
     31            ANGLE: ASTC-HDR is not available on TVOS
     32            https://bugs.webkit.org/show_bug.cgi?id=235076
     33
     34            Reviewed by Dean Jackson.
     35
     36            <rdar://87384038>
     37            This is a follow on patch to https://bugs.webkit.org/show_bug.cgi?id=234164,
     38            ASTC-HDR is only available on macOS and iOS, not tvOS or watchOS
     39        This patch fixes an internal build.
     40
     41            * scripts/code_generation_hashes/Metal_format_table.json:
     42            * src/libANGLE/renderer/metal/gen_mtl_format_table.py:
     43            (gen_image_map_switch_astc_case_tv_watchos):
     44            (gen_image_map_switch_string):
     45            (gen_image_mtl_to_angle_switch_string):
     46            (gen_image_map_switch_astc_case_watchos): Deleted.
     47            (gen_image_map_switch_astc_case_watchos.gen_format_assign_code): Deleted.
     48            * src/libANGLE/renderer/metal/mtl_format_table_autogen.mm:
     49            (rx::mtl::Format::MetalToAngleFormatID):
     50            (rx::mtl::Format::init):
     51
    1522022-01-09  Sam Weinig  <weinig@apple.com>
    253

  • branches/safari-613-branch/Source/ThirdParty/ANGLE/scripts/code_generation_hashes/Metal_format_table.json

    r287652 r287902  
    55    "951e1bceaba86eecb5c23173e897d092",
    66  "src/libANGLE/renderer/metal/gen_mtl_format_table.py":
    7     "cf0f32a98630ef4dabcf203c66d8e4ff",
     7    "7915e5a079e7307ba046136857878a6f",
    88  "src/libANGLE/renderer/metal/mtl_format_map.json":
    99    "04a80596b75c287f525dac9769219cb2",
    1010  "src/libANGLE/renderer/metal/mtl_format_table_autogen.mm":
    11     "b413ae3c84956871988e5e01cc1c92ce"
     11    "76319586335e93f945f99f9fecb03b0f"
    1212}

  • branches/safari-613-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/gen_mtl_format_table.py

    r287652 r287902  
    384384
    385385
    386 def gen_image_map_switch_astc_case_watchos(angle_format, angle_to_gl, angle_to_mtl_map):
     386def gen_image_map_switch_astc_case_tv_watchos(angle_format, angle_to_gl, angle_to_mtl_map):
    387387    gl_format = angle_to_gl[angle_format]
    388388
    … …  
    463463        switch_data += gen_image_map_switch_simple_case(angle_format, sim_override[angle_format],
    464464                                                        angle_to_gl, sim_angle_to_mtl)
    465     switch_data += "#if TARGET_OS_IOS || TARGET_OS_TV\n"
     465    switch_data += "#if TARGET_OS_IOS\n"
    466466    for angle_format in sorted(astc_tpl_map.keys()):
    467467        switch_data += gen_image_map_switch_astc_case_iosmac(angle_format, angle_to_gl,
    468468                                                             astc_tpl_map)
    469     switch_data += "#elif TARGET_OS_WATCH\n"
     469    switch_data += "#elif TARGET_OS_WATCH || TARGET_OS_TV\n"
    470470
    471471    for angle_format in sorted(astc_tpl_map.keys()):
    472         switch_data += gen_image_map_switch_astc_case_watchos(angle_format, angle_to_gl,
    473                                                               astc_tpl_map)
    474     switch_data += "#endif // TARGET_OS_IOS || TARGET_OS_TV \n "
     472        switch_data += gen_image_map_switch_astc_case_tv_watchos(angle_format, angle_to_gl,
     473                                                                 astc_tpl_map)
     474    switch_data += "#endif // TARGET_OS_IOS \n "
    475475    # iOS specific
    476476    switch_data += "#elif TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST\n"
    … …  
    481481        switch_data += gen_image_map_switch_simple_case(angle_format, ios_override[angle_format],
    482482                                                        angle_to_gl, ios_angle_to_mtl)
    483     switch_data += "#if TARGET_OS_IOS || TARGET_OS_TV\n"
     483    switch_data += "#if TARGET_OS_IOS \n"
    484484    for angle_format in sorted(astc_tpl_map.keys()):
    485485        switch_data += gen_image_map_switch_astc_case_iosmac(angle_format, angle_to_gl,
    486486                                                             astc_tpl_map)
    487487
    488     switch_data += "#elif TARGET_OS_WATCH\n"
     488    switch_data += "#elif TARGET_OS_WATCH || TARGET_OS_TV\n"
    489489
    490490    for angle_format in sorted(astc_tpl_map.keys()):
    491         switch_data += gen_image_map_switch_astc_case_watchos(angle_format, angle_to_gl,
    492                                                               astc_tpl_map)
    493     switch_data += "#endif // TARGET_OS_IOS || TARGET_OS_TV\n"
     491        switch_data += gen_image_map_switch_astc_case_tv_watchos(angle_format, angle_to_gl,
     492                                                                 astc_tpl_map)
     493    switch_data += "#endif // TARGET_OS_IOS \n"
    494494    switch_data += "#endif // TARGET_OS_IPHONE\n"
    495495
    … …  
    548548        switch_data += case_image_mtl_to_angle_template.format(
    549549            mtl_format=astc_tpl_map[angle_format] + "LDR", angle_format=angle_format)
    550     switch_data += "#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_OSX \n"
     550    switch_data += "#if TARGET_OS_IOS || TARGET_OS_OSX \n"
    551551    for angle_format in sorted(astc_tpl_map.keys()):
    552552        switch_data += case_image_mtl_to_angle_template.format(
    553553            mtl_format=astc_tpl_map[angle_format] + "HDR", angle_format=angle_format)
    554     switch_data += "#endif // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_OSX\n"
     554    switch_data += "#endif // TARGET_OS_IOS || TARGET_OS_OSX\n"
    555555    switch_data += "#endif  // TARGET_OS_IPHONE || mac 11.0+\n"
    556556
    … …  
    658658    caps_init_str += caps_to_cpp(ios_platform_caps)
    659659
    660     caps_init_str += "#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_OSX\n"
     660    caps_init_str += "#if TARGET_OS_IOS || TARGET_OS_OSX\n"
    661661    caps_init_str += caps_to_cpp(ios_specific_caps)
    662     caps_init_str += "#endif // TARGET_OS_IOS || TARGET_OS_TV || mac 11.0+ \n"
     662    caps_init_str += "#endif // TARGET_OS_IOS || mac 11.0+ \n"
    663663    caps_init_str += "#endif // TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST || mac 11.0+ \n"
    664664

  • branches/safari-613-branch/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/mtl_format_table_autogen.mm

    r287652 r287902  
    263263        case MTLPixelFormatASTC_8x8_LDR:
    264264            return angle::FormatID::ASTC_8x8_UNORM_BLOCK;
    265 #    if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_OSX
     265#    if TARGET_OS_IOS || TARGET_OS_OSX
    266266        case MTLPixelFormatASTC_10x10_HDR:
    267267            return angle::FormatID::ASTC_10x10_UNORM_BLOCK;
    … …  
    292292        case MTLPixelFormatASTC_8x8_HDR:
    293293            return angle::FormatID::ASTC_8x8_UNORM_BLOCK;
    294 #    endif  // TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_OSX
     294#    endif  // TARGET_OS_IOS || TARGET_OS_OSX
    295295#endif      // TARGET_OS_IPHONE || mac 11.0+
    296296        default:
    … …  
    15571557            break;
    15581558
    1559 #    if TARGET_OS_IOS || TARGET_OS_TV
     1559#    if TARGET_OS_IOS
    15601560        case angle::FormatID::ASTC_10x10_UNORM_BLOCK:
    15611561
    … …  
    18101810            break;
    18111811
    1812 #    elif TARGET_OS_WATCH
     1812#    elif TARGET_OS_WATCH || TARGET_OS_TV
    18131813        case angle::FormatID::ASTC_10x10_UNORM_BLOCK:
    18141814
    … …  
    19371937            break;
    19381938
    1939 #    endif  // TARGET_OS_IOS || TARGET_OS_TV
     1939#    endif  // TARGET_OS_IOS
    19401940#elif TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST
    19411941        case angle::FormatID::ASTC_10x10_SRGB_BLOCK:
    … …  
    22992299            break;
    23002300
    2301 #    if TARGET_OS_IOS || TARGET_OS_TV
     2301#    if TARGET_OS_IOS
    23022302        case angle::FormatID::ASTC_10x10_UNORM_BLOCK:
    23032303
    … …  
    25522552            break;
    25532553
    2554 #    elif TARGET_OS_WATCH
     2554#    elif TARGET_OS_WATCH || TARGET_OS_TV
    25552555        case angle::FormatID::ASTC_10x10_UNORM_BLOCK:
    25562556
    … …  
    26792679            break;
    26802680
    2681 #    endif  // TARGET_OS_IOS || TARGET_OS_TV
     2681#    endif  // TARGET_OS_IOS
    26822682#endif      // TARGET_OS_IPHONE
    26832683#if (TARGET_OS_OSX && (__MAC_OS_X_VERSION_MAX_ALLOWED >= 110000))
    … …  
    50575057                  /** depthRenderable*/ false);
    50585058
    5059 #    if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_OSX
     5059#    if TARGET_OS_IOS || TARGET_OS_OSX
    50605060    setFormatCaps(MTLPixelFormatASTC_10x10_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
    50615061                  /** writable*/ false, /** blendable*/ false, /** multisample*/ false,
    … …  
    51145114                  /** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
    51155115
    5116 #    endif  // TARGET_OS_IOS || TARGET_OS_TV || mac 11.0+
     5116#    endif  // TARGET_OS_IOS || mac 11.0+
    51175117#endif      // TARGET_OS_IPHONE && !TARGET_OS_MACCATALYST || mac 11.0+
    51185118}
Note: See TracChangeset for help on using the changeset viewer.