Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(544)

Unified Diff: content/test/gpu/gpu_tests/gpu_test_expectations.py

Issue 2529713002: Run the WebGL conformance tests with the passthrough command decoder. (Closed)
Patch Set: Remove buildbot changes. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/test/gpu/gpu_tests/gpu_test_expectations.py
diff --git a/content/test/gpu/gpu_tests/gpu_test_expectations.py b/content/test/gpu/gpu_tests/gpu_test_expectations.py
index 9df6f00736c167bfa7fae30e4b28016f22c79483..b8f4d0e635a136877f3b525f15f3981f344bd21d 100644
--- a/content/test/gpu/gpu_tests/gpu_test_expectations.py
+++ b/content/test/gpu/gpu_tests/gpu_test_expectations.py
@@ -5,7 +5,7 @@
from gpu_tests import test_expectations
ANGLE_CONDITIONS = ['d3d9', 'd3d11', 'opengl', 'no_angle']
-
+CMD_DECODER_CONDITIONS = ['passthrough', 'no_passthrough']
GPU_CONDITIONS = ['amd', 'arm', 'broadcom', 'hisilicon', 'intel', 'imagination',
'nvidia', 'qualcomm', 'vivante']
@@ -15,6 +15,7 @@ class GpuExpectation(test_expectations.Expectation):
self.gpu_conditions = []
self.device_id_conditions = []
self.angle_conditions = []
+ self.cmd_decoder_conditions = []
self.max_num_retries = max_num_retries
assert self.max_num_retries == 0 or expectation == 'flaky'
super(GpuExpectation, self).__init__(
@@ -67,6 +68,8 @@ class GpuExpectation(test_expectations.Expectation):
self.gpu_conditions.append(cl)
elif cl in ANGLE_CONDITIONS:
self.angle_conditions.append(cl)
+ elif cl in CMD_DECODER_CONDITIONS:
+ self.cmd_decoder_conditions.append(cl)
else:
# Delegate to superclass.
super(GpuExpectation, self).ParseCondition(condition)
@@ -112,8 +115,12 @@ class GpuTestExpectations(test_expectations.TestExpectations):
angle_matches = (
(not expectation.angle_conditions) or
angle_renderer in expectation.angle_conditions)
+ cmd_decoder = self._GetCommandDecoder(gpu_info)
+ cmd_decoder_matches = (
+ (not expectation.cmd_decoder_conditions) or
+ cmd_decoder in expectation.cmd_decoder_conditions)
- return gpu_matches and angle_matches
+ return gpu_matches and angle_matches and cmd_decoder_matches
def _GetGpuVendorString(self, gpu_info):
if gpu_info:
@@ -149,3 +156,9 @@ class GpuTestExpectations(test_expectations.TestExpectations):
elif 'OpenGL' in gl_renderer:
return 'opengl'
return 'no_angle'
+
+ def _GetCommandDecoder(self, gpu_info):
+ if gpu_info and gpu_info.aux_attributes and \
+ gpu_info.aux_attributes.get('passthrough_cmd_decoder', False):
+ return 'passthrough'
+ return 'no_passthrough'
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/test/gpu/gpu_tests/webgl_conformance_expectations.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698