Commit 0bfe09cf authored by Kenneth Russell's avatar Kenneth Russell Committed by Chromium LUCI CQ

Temporarily add incorrect GPU type for Apple DTK with Metal.

This allows four needed suppressions to be applied for ANGLE's Metal
backend on this GPU type.

Bug: 1153984
Change-Id: I0cb63b8921c6e78d7a1b9a889b5404d74b071830
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2569966
Auto-Submit: Kenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833005}
parent 81f1908c
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
...@@ -542,11 +542,16 @@ crbug.com/angleproject/4846 [ mac angle-metal passthrough nvidia ] conformance/t ...@@ -542,11 +542,16 @@ crbug.com/angleproject/4846 [ mac angle-metal passthrough nvidia ] conformance/t
# Mac ARM-based DTKs # Mac ARM-based DTKs
crbug.com/1130703 [ mac apple-apple-a12z no-passthrough ] conformance/textures/misc/texture-copying-and-deletion.html [ Failure ] crbug.com/1130703 [ mac apple-apple-a12z no-passthrough ] conformance/textures/misc/texture-copying-and-deletion.html [ Failure ]
crbug.com/1130703 [ mac apple-apple-a12z no-passthrough ] conformance/textures/misc/texture-copying-feedback-loops.html [ Failure ] crbug.com/1130703 [ mac apple-apple-a12z no-passthrough ] conformance/textures/misc/texture-copying-feedback-loops.html [ Failure ]
# TODO(crbug.com/1153984): remove the expectations with the incorrect GPU type for the Metal backend.
crbug.com/1130758 [ mac apple-apple-a12z ] conformance/extensions/webgl-depth-texture.html [ Failure ] crbug.com/1130758 [ mac apple-apple-a12z ] conformance/extensions/webgl-depth-texture.html [ Failure ]
crbug.com/1130758 [ mac google-angle-(metal-renderer:-apple-a12z) ] conformance/extensions/webgl-depth-texture.html [ Failure ]
crbug.com/1130759 [ mac apple-apple-a12z angle-metal ] conformance/rendering/rendering-stencil-large-viewport.html [ Failure ] crbug.com/1130759 [ mac apple-apple-a12z angle-metal ] conformance/rendering/rendering-stencil-large-viewport.html [ Failure ]
crbug.com/1130759 [ mac google-angle-(metal-renderer:-apple-a12z) angle-metal ] conformance/rendering/rendering-stencil-large-viewport.html [ Failure ]
crbug.com/1130759 [ mac apple-apple-a12z angle-metal ] conformance/textures/misc/texture-mips.html [ Failure ] crbug.com/1130759 [ mac apple-apple-a12z angle-metal ] conformance/textures/misc/texture-mips.html [ Failure ]
crbug.com/1130760 [ mac apple-apple-a12z angle-metal ] conformance/extensions/webgl-draw-buffers.html [ Failure ] crbug.com/1130760 [ mac apple-apple-a12z angle-metal ] conformance/extensions/webgl-draw-buffers.html [ Failure ]
crbug.com/1130760 [ mac google-angle-(metal-renderer:-apple-a12z) angle-metal ] conformance/extensions/webgl-draw-buffers.html [ Failure ]
crbug.com/1130760 [ mac apple-apple-a12z angle-metal ] conformance/ogles/GL/discard/discard_001_to_002.html [ Failure ] crbug.com/1130760 [ mac apple-apple-a12z angle-metal ] conformance/ogles/GL/discard/discard_001_to_002.html [ Failure ]
crbug.com/1130760 [ mac google-angle-(metal-renderer:-apple-a12z) angle-metal ] conformance/ogles/GL/discard/discard_001_to_002.html [ Failure ]
crbug.com/1141066 [ mac apple-apple-a12z angle-opengl passthrough ] conformance/textures/misc/texture-copying-and-deletion.html [ Failure ] crbug.com/1141066 [ mac apple-apple-a12z angle-opengl passthrough ] conformance/textures/misc/texture-copying-and-deletion.html [ Failure ]
crbug.com/1141066 [ mac apple-apple-a12z angle-opengl passthrough ] conformance/textures/misc/texture-copying-feedback-loops.html [ Failure ] crbug.com/1141066 [ mac apple-apple-a12z angle-opengl passthrough ] conformance/textures/misc/texture-copying-feedback-loops.html [ Failure ]
......
...@@ -35,7 +35,7 @@ TAG_HEADER = """\ ...@@ -35,7 +35,7 @@ TAG_HEADER = """\
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 amd-0x699f amd-0x7340
# apple apple-apple-a12z # apple apple-apple-a12z
# arm # arm
# google google-0xffff # google google-0xffff google-angle-(metal-renderer:-apple-a12z)
# intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b # intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x3e9b
# intel-0x5912 # intel-0x5912
# nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184 # nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
......
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