Merge lp:~justinmcp/oxide/1374494 into lp:~oxide-developers/oxide/oxide.trunk

Proposed by Justin McPherson on 2014-10-10
Status: Merged
Merged at revision: 800
Proposed branch: lp:~justinmcp/oxide/1374494
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 21 lines (+2/-3)
1 file modified
patches/accelerated-2d-support.patch (+2/-3)
To merge this branch: bzr merge lp:~justinmcp/oxide/1374494
Reviewer Review Type Date Requested Status
Chris Coulson 2014-10-10 Approve on 2014-10-15
Review via email: mp+237881@code.launchpad.net

Commit message

  Fix detection of acclerated 2d.

  - gl_ws_vender is not available generally
  - New regex support upset by () in string

To post a comment you must log in.
lp:~justinmcp/oxide/1374494 updated on 2014-10-10
793. By Justin McPherson <justin@phablet-dev> on 2014-10-10

Fix patch line count

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/accelerated-2d-support.patch'
2--- patches/accelerated-2d-support.patch 2014-09-20 02:04:40 +0000
3+++ patches/accelerated-2d-support.patch 2014-10-10 07:45:40 +0000
4@@ -16,15 +16,14 @@
5 diff -r d66c811595af gpu/config/software_rendering_list_json.cc
6 --- a/gpu/config/software_rendering_list_json.cc Sat Sep 20 00:25:11 2014 +1000
7 +++ b/gpu/config/software_rendering_list_json.cc Sat Sep 20 12:02:17 2014 +1000
8-@@ -245,6 +245,13 @@
9+@@ -245,6 +245,12 @@
10 "os": {
11 "type": "linux"
12 },
13 + "exceptions": [
14 + {
15-+ "gl_ws_vendor": "Android",
16 + "gl_vendor": "Qualcomm",
17-+ "gl_renderer": "Adreno (TM) 320"
18++ "gl_renderer": "Adreno.*320"
19 + }
20 + ],
21 "features": [

Subscribers

People subscribed via source and target branches