Skip to content

A
angle
Commit 8df3e5f2 by Alexey Knyazev Committed by Commit Bot
Options

Metal: update format caps

Added MTLGPUFamilyApple6 and MTLGPUFamilyApple7 caps. Bug: angleproject:2634, angleproject:5672 Change-Id: Icc35f823cdd018246a8ac3b1179adc81584fb204 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2846832Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarLe Hoang Quyen <le.hoang.q@gmail.com> Commit-Queue: Alexey Knyazev <lexa.knyazev@gmail.com>
parent 9b4fd545
Showing with 109 additions and 10 deletions
scripts/code_generation_hashes/Metal_format_table.json
......@@ -6,7 +6,7 @@
"src/libANGLE/renderer/metal/gen_mtl_format_table.py":
"aabe2ff87c8d03cae69125535089e392",
"src/libANGLE/renderer/metal/mtl_format_map.json":
"fa859c45367bd80c055793ffb209b4fc",
"1177b4929d1effd50be45b4347dce2a0",
"src/libANGLE/renderer/metal/mtl_format_table_autogen.mm":
"f7fec5457e13020368121f594c48a17a"
"3a2466058c38a51a03f9c783188f4987"
}
\ No newline at end of file
src/libANGLE/renderer/metal/mtl_format_map.json
......@@ -509,7 +509,7 @@
"filterable": "false",
"writable": "true",
"blendable": "false",
"multisample": "display->supportsMacGPUFamily(1)",
"multisample": "display->supportsEitherGPUFamily(7, 1)",
"resolve": "false",
"colorRenderable": "true"
},
......@@ -517,7 +517,7 @@
"filterable": "false",
"writable": "true",
"blendable": "false",
"multisample": "display->supportsMacGPUFamily(1)",
"multisample": "display->supportsEitherGPUFamily(7, 1)",
"resolve": "false",
"colorRenderable": "true"
},
......@@ -557,7 +557,7 @@
"filterable": "display->supportsMacGPUFamily(1)",
"writable": "true",
"blendable": "true",
"multisample": "display->supportsMacGPUFamily(1)",
"multisample": "display->supportsEitherGPUFamily(7, 1)",
"resolve": "display->supportsMacGPUFamily(1)",
"colorRenderable": "true"
},
......@@ -565,7 +565,7 @@
"filterable": "display->supportsMacGPUFamily(1)",
"writable": "true",
"blendable": "display->supportsMacGPUFamily(1)",
"multisample": "display->supportsMacGPUFamily(1)",
"multisample": "display->supportsEitherGPUFamily(7, 1)",
"resolve": "display->supportsMacGPUFamily(1)",
"colorRenderable": "true"
},
......@@ -829,6 +829,48 @@
},
"MTLPixelFormatASTC_12x12_sRGB":{
"filterable": "display->supportsAppleGPUFamily(2)"
},
"MTLPixelFormatASTC_4x4_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_5x4_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_5x5_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_6x5_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_6x6_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_8x5_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_8x6_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_8x8_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_10x5_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_10x6_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_10x8_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_10x10_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_12x10_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
},
"MTLPixelFormatASTC_12x12_HDR":{
"filterable": "display->supportsAppleGPUFamily(6)"
}
}
},
......
src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
......@@ -3542,16 +3542,16 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
setFormatCaps(MTLPixelFormatRG32Float, /** filterable*/ display->supportsMacGPUFamily(1),
/** writable*/ true, /** blendable*/ true,
/** multisample*/ display->supportsMacGPUFamily(1),
/** multisample*/ display->supportsEitherGPUFamily(7, 1),
/** resolve*/ display->supportsMacGPUFamily(1), /** colorRenderable*/ true,
/** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatRG32Sint, /** filterable*/ false, /** writable*/ true,
/** blendable*/ false, /** multisample*/ display->supportsMacGPUFamily(1),
/** blendable*/ false, /** multisample*/ display->supportsEitherGPUFamily(7, 1),
/** resolve*/ false, /** colorRenderable*/ true, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatRG32Uint, /** filterable*/ false, /** writable*/ true,
/** blendable*/ false, /** multisample*/ display->supportsMacGPUFamily(1),
/** blendable*/ false, /** multisample*/ display->supportsEitherGPUFamily(7, 1),
/** resolve*/ false, /** colorRenderable*/ true, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatRG8Sint, /** filterable*/ false, /** writable*/ true,
......@@ -3613,7 +3613,7 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
setFormatCaps(MTLPixelFormatRGBA32Float, /** filterable*/ display->supportsMacGPUFamily(1),
/** writable*/ true, /** blendable*/ display->supportsMacGPUFamily(1),
/** multisample*/ display->supportsMacGPUFamily(1),
/** multisample*/ display->supportsEitherGPUFamily(7, 1),
/** resolve*/ display->supportsMacGPUFamily(1), /** colorRenderable*/ true,
/** depthRenderable*/ false);
......@@ -3736,6 +3736,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** colorRenderable*/ display->supportsAppleGPUFamily(1),
/** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_10x10_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_10x10_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3745,6 +3749,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** blendable*/ false, /** multisample*/ false, /** resolve*/ false,
/** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_10x5_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_10x5_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3753,6 +3761,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_10x6_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_10x6_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3761,6 +3773,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_10x8_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_10x8_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3769,6 +3785,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_12x10_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_12x10_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3778,6 +3798,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** blendable*/ false, /** multisample*/ false, /** resolve*/ false,
/** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_12x12_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_12x12_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3787,6 +3811,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** blendable*/ false, /** multisample*/ false, /** resolve*/ false,
/** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_4x4_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_4x4_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3795,6 +3823,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_5x4_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_5x4_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3803,6 +3835,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_5x5_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_5x5_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3811,6 +3847,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_6x5_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_6x5_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3819,6 +3859,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_6x6_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_6x6_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3827,6 +3871,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_8x5_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_8x5_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3835,6 +3883,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_8x6_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_8x6_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......@@ -3843,6 +3895,10 @@ void FormatTable::initNativeFormatCapsAutogen(const DisplayMtl *display)
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_8x8_HDR, /** filterable*/ display->supportsAppleGPUFamily(6),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
setFormatCaps(MTLPixelFormatASTC_8x8_LDR, /** filterable*/ display->supportsAppleGPUFamily(2),
/** writable*/ false, /** blendable*/ false, /** multisample*/ false,
/** resolve*/ false, /** colorRenderable*/ false, /** depthRenderable*/ false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment