diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-04-02 10:42:24 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2024-04-02 10:42:24 +0000 |
| commit | a3f73acb9d2cdc62692af7ff93c51f910dff2d0d (patch) | |
| tree | 303d205e8e6ed9676bdcbe006a402c23bf668f6c /lib/mesa/src/intel/isl/gen_format_layout.py | |
| parent | f54e142455cb3c9d1662dae7e096a32a47e5409b (diff) | |
Merge Mesa 23.3.6
Diffstat (limited to 'lib/mesa/src/intel/isl/gen_format_layout.py')
| -rw-r--r-- | lib/mesa/src/intel/isl/gen_format_layout.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mesa/src/intel/isl/gen_format_layout.py b/lib/mesa/src/intel/isl/gen_format_layout.py index 72c8ad8f0..3a21c2729 100644 --- a/lib/mesa/src/intel/isl/gen_format_layout.py +++ b/lib/mesa/src/intel/isl/gen_format_layout.py @@ -253,12 +253,14 @@ def get_srgb_to_linear_map(formats): ('_SRGB', ''), ('SRGB', 'RGB'), ('U8SRGB', 'FLT16'), + # Quirk: ETC2_EAC_SRGB8_A8 -> ETC2_EAC_RGBA8 + ('SRGB8_A8', 'RGBA8'), ] found = False for rep in replacements: rgb_name = fmt.name.replace(rep[0], rep[1]) - if rgb_name in names: + if rgb_name in names and rgb_name != fmt.name: found = True yield fmt.name, rgb_name break |