Index: content/test/gpu/page_sets/gpu_process_tests.py |
diff --git a/content/test/gpu/page_sets/gpu_process_tests.py b/content/test/gpu/page_sets/gpu_process_tests.py |
index 29689637a86bc1ffa8047636b0bfa450a5214708..050fdfaa5d63a5501ccd9e1062d9724901f4b631 100644 |
--- a/content/test/gpu/page_sets/gpu_process_tests.py |
+++ b/content/test/gpu/page_sets/gpu_process_tests.py |
@@ -175,9 +175,9 @@ class NoGpuProcessSharedPageState(GpuProcessSharedPageState): |
options = finder_options.browser_options |
if options.browser_type.startswith('android'): |
- # There is currently no entry in kSoftwareRenderingListJson that disables |
- # all gpu features on Android. |
- pass |
+ # Hit id 8 from kSoftwareRenderingListJson, which applies to any platform. |
+ options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x10de') |
+ options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0324') |
Julien Isorce Samsung
2016/08/10 12:54:55
I made this test work on Android while I was at it
|
elif sys.platform in ('cygwin', 'win32'): |
# Hit id 34 from kSoftwareRenderingListJson. |
options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x5333') |
@@ -219,15 +219,18 @@ class NoGpuProcessPage(gpu_test_base.PageBase): |
class SoftwareGpuProcessSharedPageState(GpuProcessSharedPageState): |
+ |
def __init__(self, test, finder_options, story_set): |
super(SoftwareGpuProcessSharedPageState, self).__init__( |
test, finder_options, story_set) |
options = finder_options.browser_options |
+ |
+ # Hit exception from id 50 from kSoftwareRenderingListJson. |
options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x10de') |
options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0de1') |
options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=VMware') |
options.AppendExtraBrowserArgs('--gpu-testing-gl-renderer=SVGA3D') |
- options.AppendExtraBrowserArgs('--gpu-testing-gl-version="2.1 Mesa 10.1"') |
+ options.AppendExtraBrowserArgs('--gpu-testing-gl-version=2.1 Mesa 10.1') |
Julien Isorce Samsung
2016/08/10 12:54:55
Cosmetic change.
|
class SoftwareGpuProcessPage(gpu_test_base.PageBase): |
@@ -296,8 +299,7 @@ class DriverBugWorkaroundsUponGLRendererShared(GpuProcessSharedPageState): |
options = finder_options.browser_options |
if options.browser_type.startswith('android'): |
# Hit id 108 from kGpuDriverBugListJson. |
- options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=ARM') |
- options.AppendExtraBrowserArgs('--gpu-testing-gl-renderer=Mali-400') |
+ options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=Qualcomm') |
Julien Isorce Samsung
2016/08/10 12:54:55
This fixes one of the 3 issues that lead to revert
|
elif sys.platform in ('cygwin', 'win32'): |
# Hit id 51 and 87 from kGpuDriverBugListJson. |
options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x1002') |
@@ -326,7 +328,7 @@ class DriverBugWorkaroundsUponGLRendererPage(DriverBugWorkaroundsTestsPage): |
self.unexpected_workaround = None |
if is_platform_android: |
- self.expected_workaround = "disable_gl_rgb_format" |
+ self.expected_workaround = "wake_up_gpu_before_drawing" |
elif sys.platform in ('cygwin', 'win32'): |
self.expected_workaround = "texsubimage_faster_than_teximage" |
self.unexpected_workaround = "disable_d3d11" |
@@ -475,8 +477,9 @@ class ReadbackWebGLGpuProcessSharedPageState(GpuProcessSharedPageState): |
super(ReadbackWebGLGpuProcessSharedPageState, self).__init__( |
test, finder_options, story_set) |
options = finder_options.browser_options |
+ is_platform_android = options.browser_type.startswith('android') |
- if sys.platform.startswith('linux'): |
+ if sys.platform.startswith('linux') and not is_platform_android: |
Julien Isorce Samsung
2016/08/10 12:54:55
Fixes one of the 3 issues that caused a revert. I
|
# Hit id 110 from kSoftwareRenderingListJson. |
options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x10de') |
options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0de1') |
@@ -608,7 +611,6 @@ class GpuProcessTestsStorySet(story_set_module.StorySet): |
self.AddStory(FunctionalVideoPage(self, expectations)) |
self.AddStory(GpuInfoCompletePage(self, expectations)) |
self.AddStory(NoGpuProcessPage(self, expectations, is_platform_android)) |
- self.AddStory(SoftwareGpuProcessPage(self, expectations)) |
self.AddStory(DriverBugWorkaroundsInGpuProcessPage(self, expectations)) |
self.AddStory(ReadbackWebGLGpuProcessPage(self, expectations, |
is_platform_android)) |
@@ -628,6 +630,10 @@ class GpuProcessTestsStorySet(story_set_module.StorySet): |
self.AddStory(IdentifyActiveGpuPage3(self, expectations)) |
self.AddStory(IdentifyActiveGpuPage4(self, expectations)) |
+ # There is currently no entry in kSoftwareRenderingListJson that enables |
+ # a software GL driver on Android. |
+ self.AddStory(SoftwareGpuProcessPage(self, expectations)) |
Julien Isorce Samsung
2016/08/10 12:54:55
Fixes one of the 3 issues that caused a revert. Se
|
+ |
@property |
def allow_mixed_story_states(self): |
# Return True here in order to be able to run pages with different browser |