platform/upstream/VK-GL-CTS.git
6 years agoFix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2 am...
Pyry Haulos [Thu, 14 Sep 2017 06:10:22 +0000 (06:10 +0000)]
Fix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2 am: 6d0cee6923 am: b2c811831a am: b894b8405a
am: 2960985b29

Change-Id: I5a4210acd6c017813c68f59299ecd7bfae1d6215

6 years agoMerge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
Graeme Leese [Thu, 14 Sep 2017 06:10:00 +0000 (06:10 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am: 4f1051ad32 am: b8e4ff4043 am: a2d901c3d8 am: 2431a0b0d9 am: 5fe6ec300f am: 781a2ef1e0 am: b85caaf64f am: 71e31a40d0 am: 05b87916aa
am: 1c4e3d753a

Change-Id: I20444361f8be75108d7dad7a72f084d2a69d5077

6 years agoMerge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
Graeme Leese [Thu, 14 Sep 2017 06:09:31 +0000 (06:09 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am: 4f1051ad32 am: 5bd0fb31a1 am: 3558abf238 am: 222fa619e5 am: 37ce9a1ac7 am: 1801be75eb am: 7a13186710 am: d8c8426600
am: 6d34feb93f

Change-Id: Id425ed7c01ae2eef89ba4934fa6f53626c5b45a0

6 years agoCP: Add triangle edge guardband for Tex2D lookup diff am: e345d7b6ba am: 4c1d622080...
Kalle Raita [Thu, 14 Sep 2017 06:08:43 +0000 (06:08 +0000)]
CP: Add triangle edge guardband for Tex2D lookup diff am: e345d7b6ba am: 4c1d622080 am: 4ab44720da
am: 9bc78bece0

Change-Id: I1020e567bde25760df089c6d9f37bf72c450db24

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: b426d8bfad am: 580f143209 am: 73a16f417e...
Mika Isojrvi [Thu, 14 Sep 2017 06:08:26 +0000 (06:08 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: b426d8bfad am: 580f143209 am: 73a16f417e am: 550064261f am: 1b81ecf035 am: 68d441aedd am: 088fbbc341 am: e3939224e7 am: 495df8aec0 am: 271d2c56f9 am: 9225c91f56 am: 6027b21dbd
am: 0bddbbce3d

Change-Id: I47710c0f6e5f365d919c499ffa293c659ba5ba93

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20 am: cae1fe52ac...
Mika Isojrvi [Thu, 14 Sep 2017 06:07:59 +0000 (06:07 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20 am: cae1fe52ac am: 754e8f0192 am: d422ad8111 am: a8804ca914 am: 802854925b am: 20b0bc0b90 am: 76e5904f30
am: 68ef69d98d

Change-Id: Idb637db34c2ff3702b5f308d89ff10b5f90a7df5

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: d4c01761d3 am: d20475d813...
Mika Isojrvi [Thu, 14 Sep 2017 06:07:19 +0000 (06:07 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: d4c01761d3 am: d20475d813 am: 66bd71c817 am: c06d76b076 am: 5e5d57c9d9 am: c390c23bce am: ad76ebf6f6
am: 764d758e04

Change-Id: Ib2200ed6651344ef4d07403d1082924b9d030ea6

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: b78f9...
Mika Isojrvi [Thu, 14 Sep 2017 06:06:26 +0000 (06:06 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: b78f9b0e57 am: c2180f74a8 am: 76b48a0db2 am: ff2205c90c am: bde0d133a4 am: 2649b40abc am: 107b2648f3
am: 545cc4fd82

Change-Id: I8c6d44d2343f473ec964b5a2b561ef3ad3927623

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: 6c0e0...
Mika Isojrvi [Thu, 14 Sep 2017 06:06:07 +0000 (06:06 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: 6c0e0ebde7 am: 371f033807 am: e64be738f6 am: a242f668a7 am: 7ed7199caf am: a921fc5252 am: aa0d12fbef am: 43f2b3888a
am: 0836b439a5

Change-Id: Iea2f6a8d9c89d7a65f16aa6cd82cc457f874ce44

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: e37b18673d am: 97ce4...
Mika Isojrvi [Thu, 14 Sep 2017 06:05:47 +0000 (06:05 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: e37b18673d am: 97ce4c6f8c am: 4c56c58687 am: 0ddc9faea1 am: d2d7d49296 am: 301312d147 am: 4dd9680c5d am: bf288e2971 am: 1678011b33 am: 14f0575d74 am: bd57c1986d am: cd3a7372ce
am: 441427f842

Change-Id: Ia70fa53bf9e7ae85f5a44034d3801080779602eb

6 years agoFix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2 am...
Pyry Haulos [Thu, 14 Sep 2017 05:45:04 +0000 (05:45 +0000)]
Fix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2 am: 6d0cee6923 am: b2c811831a
am: b894b8405a

Change-Id: I0b1b505013d1abc6fc21c5acbaf33c97bb52c25b

6 years agoMerge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
Graeme Leese [Thu, 14 Sep 2017 05:44:44 +0000 (05:44 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am: 4f1051ad32 am: b8e4ff4043 am: a2d901c3d8 am: 2431a0b0d9 am: 5fe6ec300f am: 781a2ef1e0 am: b85caaf64f am: 71e31a40d0
am: 05b87916aa

Change-Id: Ic912afa3d3e0f1c77af28d22b34d31aa5e6ff632

6 years agoMerge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
Graeme Leese [Thu, 14 Sep 2017 05:44:25 +0000 (05:44 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am: 4f1051ad32 am: 5bd0fb31a1 am: 3558abf238 am: 222fa619e5 am: 37ce9a1ac7 am: 1801be75eb am: 7a13186710
am: d8c8426600

Change-Id: I14ca9ed727937431564bddaa28adf15addd9818f

6 years agoCP: Add triangle edge guardband for Tex2D lookup diff am: e345d7b6ba am: 4c1d622080
Kalle Raita [Thu, 14 Sep 2017 05:44:05 +0000 (05:44 +0000)]
CP: Add triangle edge guardband for Tex2D lookup diff am: e345d7b6ba am: 4c1d622080
am: 4ab44720da

Change-Id: Ie7148696d4b804c925a65a158103fb247ed11ef0

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: b426d8bfad am: 580f143209 am: 73a16f417e...
Mika Isojrvi [Thu, 14 Sep 2017 05:43:45 +0000 (05:43 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: b426d8bfad am: 580f143209 am: 73a16f417e am: 550064261f am: 1b81ecf035 am: 68d441aedd am: 088fbbc341 am: e3939224e7 am: 495df8aec0 am: 271d2c56f9 am: 9225c91f56
am: 6027b21dbd

Change-Id: If701b540ea896ed342014448d8f537662d4ff874

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20 am: cae1fe52ac...
Mika Isojrvi [Thu, 14 Sep 2017 05:43:25 +0000 (05:43 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20 am: cae1fe52ac am: 754e8f0192 am: d422ad8111 am: a8804ca914 am: 802854925b am: 20b0bc0b90
am: 76e5904f30

Change-Id: I2c503a7793df5a0935f44578ec2a5961f5690881

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: d4c01761d3 am: d20475d813...
Mika Isojrvi [Thu, 14 Sep 2017 05:43:07 +0000 (05:43 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: d4c01761d3 am: d20475d813 am: 66bd71c817 am: c06d76b076 am: 5e5d57c9d9 am: c390c23bce
am: ad76ebf6f6

Change-Id: Ie72610afba0885514c956d5cff7607655c88f8e1

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: b78f9...
Mika Isojrvi [Thu, 14 Sep 2017 05:42:47 +0000 (05:42 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: b78f9b0e57 am: c2180f74a8 am: 76b48a0db2 am: ff2205c90c am: bde0d133a4 am: 2649b40abc
am: 107b2648f3

Change-Id: Iaa43cc9d5a533f526cc056bfb5e6c4baba908e6f

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: 6c0e0...
Mika Isojrvi [Thu, 14 Sep 2017 05:42:29 +0000 (05:42 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: 6c0e0ebde7 am: 371f033807 am: e64be738f6 am: a242f668a7 am: 7ed7199caf am: a921fc5252 am: aa0d12fbef
am: 43f2b3888a

Change-Id: I44bd90e26b331abe3442079f5184b11edef95cf0

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: e37b18673d am: 97ce4...
Mika Isojrvi [Thu, 14 Sep 2017 05:42:09 +0000 (05:42 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: e37b18673d am: 97ce4c6f8c am: 4c56c58687 am: 0ddc9faea1 am: d2d7d49296 am: 301312d147 am: 4dd9680c5d am: bf288e2971 am: 1678011b33 am: 14f0575d74 am: bd57c1986d
am: cd3a7372ce

Change-Id: I611c3b40040262e2ff5813d2ae5044ae9b989937

6 years agoFix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2 am...
Pyry Haulos [Thu, 14 Sep 2017 05:26:14 +0000 (05:26 +0000)]
Fix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2 am: 6d0cee6923
am: b2c811831a

Change-Id: I8b7782f37749cad734e667a98b981711ede6ebb3

6 years agoMerge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
Graeme Leese [Thu, 14 Sep 2017 05:25:57 +0000 (05:25 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am: 4f1051ad32 am: b8e4ff4043 am: a2d901c3d8 am: 2431a0b0d9 am: 5fe6ec300f am: 781a2ef1e0 am: b85caaf64f
am: 71e31a40d0

Change-Id: Ib4fd2a45e25578e6f5b0c07cd3880d10fcc3f1ab

6 years agoMerge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
Graeme Leese [Thu, 14 Sep 2017 05:25:36 +0000 (05:25 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am: 4f1051ad32 am: 5bd0fb31a1 am: 3558abf238 am: 222fa619e5 am: 37ce9a1ac7 am: 1801be75eb
am: 7a13186710

Change-Id: Iba3b94ec72f4a79c1824503ccde2080d5b9bb199

6 years agoCP: Add triangle edge guardband for Tex2D lookup diff am: e345d7b6ba
Kalle Raita [Thu, 14 Sep 2017 05:25:18 +0000 (05:25 +0000)]
CP: Add triangle edge guardband for Tex2D lookup diff am: e345d7b6ba
am: 4c1d622080

Change-Id: I46980d0de4e498ea6b34c3660100ef42207abb83

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: b426d8bfad am: 580f143209 am: 73a16f417e...
Mika Isojrvi [Thu, 14 Sep 2017 05:25:03 +0000 (05:25 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: b426d8bfad am: 580f143209 am: 73a16f417e am: 550064261f am: 1b81ecf035 am: 68d441aedd am: 088fbbc341 am: e3939224e7 am: 495df8aec0 am: 271d2c56f9
am: 9225c91f56

Change-Id: I05304de8f983d48f81095c5fb5da202ffcde588e

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20 am: cae1fe52ac...
Mika Isojrvi [Thu, 14 Sep 2017 05:24:44 +0000 (05:24 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20 am: cae1fe52ac am: 754e8f0192 am: d422ad8111 am: a8804ca914 am: 802854925b
am: 20b0bc0b90

Change-Id: Iae259f288e7ab9e5e8018d35d881fed878e04fa3

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: d4c01761d3 am: d20475d813...
Mika Isojrvi [Thu, 14 Sep 2017 05:24:25 +0000 (05:24 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: d4c01761d3 am: d20475d813 am: 66bd71c817 am: c06d76b076 am: 5e5d57c9d9
am: c390c23bce

Change-Id: Ia11b6baedab9da29a39a1d3062bebce1bd50f73e

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: b78f9...
Mika Isojrvi [Thu, 14 Sep 2017 05:24:05 +0000 (05:24 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: b78f9b0e57 am: c2180f74a8 am: 76b48a0db2 am: ff2205c90c am: bde0d133a4
am: 2649b40abc

Change-Id: Ib7d8baf77b6451a4e5a6a11c3d7f2a9d8e75953c

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: 6c0e0...
Mika Isojrvi [Thu, 14 Sep 2017 05:23:40 +0000 (05:23 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: 6c0e0ebde7 am: 371f033807 am: e64be738f6 am: a242f668a7 am: 7ed7199caf am: a921fc5252
am: aa0d12fbef

Change-Id: Idbcf6629200847deb6840ff516efb7e46d32faaf

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: e37b18673d am: 97ce4...
Mika Isojrvi [Thu, 14 Sep 2017 05:23:19 +0000 (05:23 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: e37b18673d am: 97ce4c6f8c am: 4c56c58687 am: 0ddc9faea1 am: d2d7d49296 am: 301312d147 am: 4dd9680c5d am: bf288e2971 am: 1678011b33 am: 14f0575d74
am: bd57c1986d

Change-Id: Ie53cb6206c1bea284ee1f4036b2fc710ba2d6133

6 years agoFix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2
Pyry Haulos [Thu, 14 Sep 2017 02:20:20 +0000 (02:20 +0000)]
Fix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2
am: 6d0cee6923

Change-Id: I7155ee4dfca234f42d6cdd02ac65f65a6b10d504

6 years agoMerge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
Graeme Leese [Thu, 14 Sep 2017 02:20:00 +0000 (02:20 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am: 4f1051ad32 am: b8e4ff4043 am: a2d901c3d8 am: 2431a0b0d9 am: 5fe6ec300f am: 781a2ef1e0
am: b85caaf64f

Change-Id: I1ef65460f3e67367b871e9b601401ba767c6c674

6 years agoMerge "Fix extension support checks in negative api tests" into nougat-cts-dev am...
Graeme Leese [Thu, 14 Sep 2017 02:19:45 +0000 (02:19 +0000)]
Merge "Fix extension support checks in negative api tests" into nougat-cts-dev am: 4f1051ad32 am: 5bd0fb31a1 am: 3558abf238 am: 222fa619e5 am: 37ce9a1ac7
am: 1801be75eb

Change-Id: I7753a883d40e28eb6020218ee3ac1944d3f8d974

6 years agoCP: Add triangle edge guardband for Tex2D lookup diff
Kalle Raita [Thu, 14 Sep 2017 02:19:26 +0000 (02:19 +0000)]
CP: Add triangle edge guardband for Tex2D lookup diff
am: e345d7b6ba

Change-Id: I1d52d5d5d0cb5b1c53de7fc43e27f526680608e5

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: b426d8bfad am: 580f143209 am: 73a16f417e...
Mika Isojrvi [Thu, 14 Sep 2017 02:19:10 +0000 (02:19 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: b426d8bfad am: 580f143209 am: 73a16f417e am: 550064261f am: 1b81ecf035 am: 68d441aedd am: 088fbbc341 am: e3939224e7 am: 495df8aec0
am: 271d2c56f9

Change-Id: I0a239959cda4fce12548f79b20fe12a12519320c

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20 am: cae1fe52ac...
Mika Isojrvi [Thu, 14 Sep 2017 02:18:56 +0000 (02:18 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: 6e80057a20 am: cae1fe52ac am: 754e8f0192 am: d422ad8111 am: a8804ca914
am: 802854925b

Change-Id: I1be013ce9a238f81e973ecff1eac9ad45dfaaa44

6 years agoFix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: d4c01761d3 am: d20475d813...
Mika Isojrvi [Thu, 14 Sep 2017 02:18:38 +0000 (02:18 +0000)]
Fix atomic ssbo xor test am: f0fa05e898 am: 14cd264501 am: d4c01761d3 am: d20475d813 am: 66bd71c817 am: c06d76b076
am: 5e5d57c9d9

Change-Id: Ia837c1a5524aa4935fefcf015f3f832aba1e739e

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: b78f9...
Mika Isojrvi [Thu, 14 Sep 2017 02:18:18 +0000 (02:18 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: b78f9b0e57 am: c2180f74a8 am: 76b48a0db2 am: ff2205c90c
am: bde0d133a4

Change-Id: Id371d2842d97e3f5d3d52d2b107e8e3d74b80719

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: 6c0e0...
Mika Isojrvi [Thu, 14 Sep 2017 02:18:01 +0000 (02:18 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: 4d1d6446da am: 6c0e0ebde7 am: 371f033807 am: e64be738f6 am: a242f668a7 am: 7ed7199caf
am: a921fc5252

Change-Id: I0825b4f59d2fbc8485ff24f6eec748757e7f8f09

6 years agoMask compared bits in atomic operation tests. am: b2ed9fbe1a am: e37b18673d am: 97ce4...
Mika Isojrvi [Thu, 14 Sep 2017 02:17:29 +0000 (02:17 +0000)]
Mask compared bits in atomic operation tests. am: b2ed9fbe1a am: e37b18673d am: 97ce4c6f8c am: 4c56c58687 am: 0ddc9faea1 am: d2d7d49296 am: 301312d147 am: 4dd9680c5d am: bf288e2971 am: 1678011b33
am: 14f0575d74

Change-Id: I0e0ae598f390c38b1d57cb83d161ab6921020168

6 years agoCatch BAD_MATCH from createWindowSurface
Courtney Goeltzenleuchter [Thu, 14 Sep 2017 00:30:04 +0000 (00:30 +0000)]
Catch BAD_MATCH from createWindowSurface
am: c6b2df70ee

Change-Id: I4a655c9091f9c729e882a4a1ea611f2ef1af830e

6 years agoCatch BAD_MATCH from createWindowSurface am: 7df6c12492 am: 7133594cbd
Courtney Goeltzenleuchter [Wed, 13 Sep 2017 23:33:48 +0000 (23:33 +0000)]
Catch BAD_MATCH from createWindowSurface am: 7df6c12492 am: 7133594cbd
am: 7dc8d6721b

Change-Id: I4c42c62648cbb40714df270cb598bed72300e6e4

6 years agoRequire EGL_KHR_gl_colorspace for wide_color tests am: b446f2dd21 am: 7148462684
Courtney Goeltzenleuchter [Wed, 13 Sep 2017 23:33:30 +0000 (23:33 +0000)]
Require EGL_KHR_gl_colorspace for wide_color tests am: b446f2dd21 am: 7148462684
am: 36e912b000

Change-Id: I00b1b35cc60e6ee7b451c0d66d1bfafca6cfafc3

6 years agoCatch BAD_MATCH from createWindowSurface am: 7df6c12492
Courtney Goeltzenleuchter [Wed, 13 Sep 2017 21:50:04 +0000 (21:50 +0000)]
Catch BAD_MATCH from createWindowSurface am: 7df6c12492
am: 7133594cbd

Change-Id: I254d5fb840314948133c7c74b607492ea3abc333

6 years agoRequire EGL_KHR_gl_colorspace for wide_color tests am: b446f2dd21
Courtney Goeltzenleuchter [Wed, 13 Sep 2017 21:49:39 +0000 (21:49 +0000)]
Require EGL_KHR_gl_colorspace for wide_color tests am: b446f2dd21
am: 7148462684

Change-Id: Ic67d81ea7008a6cca1dfb17f181ccf6b525144ce

6 years agoCatch BAD_MATCH from createWindowSurface
Courtney Goeltzenleuchter [Wed, 13 Sep 2017 21:41:53 +0000 (21:41 +0000)]
Catch BAD_MATCH from createWindowSurface
am: 7df6c12492

Change-Id: I03ba8d57c83f0f50bdceeb9e91f8bd312cefd667

6 years agoRequire EGL_KHR_gl_colorspace for wide_color tests
Courtney Goeltzenleuchter [Wed, 13 Sep 2017 21:32:07 +0000 (21:32 +0000)]
Require EGL_KHR_gl_colorspace for wide_color tests
am: b446f2dd21

Change-Id: I3cee6f50232dcb639f4aba9e51c3c050b18bc2cc

6 years agoCatch BAD_MATCH from createWindowSurface
Courtney Goeltzenleuchter [Tue, 12 Sep 2017 23:11:21 +0000 (17:11 -0600)]
Catch BAD_MATCH from createWindowSurface

On some platforms, it's possible to fail createWindowSurface
for some attribute combinations. Catch that case and return
NotSupported rather than a test failure.
Test: adb -d shell am start \
        -n com.drawelements.deqp/android.app.NativeActivity \
        -e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
        --deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Bug: 65376495

Change-Id: I6546cbdfc011c7d26cfa3cdad7cc6f0df1b67122
(cherry picked from commit c35781eb8d47be8ab51b0891d1ab9bb62665488b)

6 years agoCatch BAD_MATCH from createWindowSurface
Courtney Goeltzenleuchter [Tue, 12 Sep 2017 23:11:21 +0000 (17:11 -0600)]
Catch BAD_MATCH from createWindowSurface

On some platforms, it's possible to fail createWindowSurface
for some attribute combinations. Catch that case and return
NotSupported rather than a test failure.
Test: adb -d shell am start \
        -n com.drawelements.deqp/android.app.NativeActivity \
        -e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
        --deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Bug: 65376495

Change-Id: I6546cbdfc011c7d26cfa3cdad7cc6f0df1b67122

6 years agoRequire EGL_KHR_gl_colorspace for wide_color tests
Courtney Goeltzenleuchter [Tue, 12 Sep 2017 23:10:51 +0000 (17:10 -0600)]
Require EGL_KHR_gl_colorspace for wide_color tests

These tests utilize enum EGL_GL_COLORSPACE_KHR which is introduced by
EGL_KHR_gl_colorspace extension, check first for support and skip the
test if extension is not supported.

v2: loosen the check, only check when enum in use (Courtney)
v3: use EGL_NONE instead of DE_NULL when indicating that test
should use the default colorspace. That is do not include
the EGL_GL_COLORSPACE_KHR attribute in the appropriate
create function.
Test: adb -d shell am start \
      -n com.drawelements.deqp/android.app.NativeActivity \
      -e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
      --deqp-log-filename=/sdcard/dEQP-Log.qpa"'
Bug: 65291400

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
(cherry picked from commit fbf132dcf9467388408627bee73d90f7e8a1d401)

Change-Id: I6bd6423e6eb5fe4bb4df0222ab624c41446b0b60

6 years agoFix handling of EGL_NONE as color space am: dd7aa9e15d am: 5b6a83de51
Courtney Goeltzenleuchter [Tue, 12 Sep 2017 14:15:45 +0000 (14:15 +0000)]
Fix handling of EGL_NONE as color space am: dd7aa9e15d am: 5b6a83de51
am: ee92872454

Change-Id: If3a8a2b72bdae4e68c92dfa5e975ae9d1cc706f5

6 years agoFix handling of EGL_NONE as color space am: dd7aa9e15d
Courtney Goeltzenleuchter [Tue, 12 Sep 2017 14:13:15 +0000 (14:13 +0000)]
Fix handling of EGL_NONE as color space am: dd7aa9e15d
am: 5b6a83de51

Change-Id: I0274f44ebed4df844d90252cfcda800ae7fc2f79

6 years agoFix handling of EGL_NONE as color space
Courtney Goeltzenleuchter [Tue, 12 Sep 2017 14:10:14 +0000 (14:10 +0000)]
Fix handling of EGL_NONE as color space
am: dd7aa9e15d

Change-Id: Iae79d7d37f1147fca2c956a2497da0047e5c1176

6 years agoFix handling of EGL_NONE as color space
Courtney Goeltzenleuchter [Mon, 11 Sep 2017 19:06:48 +0000 (13:06 -0600)]
Fix handling of EGL_NONE as color space

Color space of EGL_NONE was getting passed down and
driver threw EGL_BAD_ATTRIBUTE in response.
Issue was caused when changing the colorspace from nullptr
to EGL_NONE, missed a couple of places that needed to
test against EGL_NONE instead of nullptr.

Bug: 65376495
Test: adb -d shell am start \
          -n com.drawelements.deqp/android.app.NativeActivity \
          -e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
          --deqp-log-filename=/sdcard/dEQP-Log.qpa"'

Change-Id: If8812725be9d3858bf610c647ba53ff38944dd50
(cherry picked from commit 0d4e616c35fd3cbad82eb3c1f0a604dbbc6c8662)

6 years agoFix handling of EGL_NONE as color space
Courtney Goeltzenleuchter [Mon, 11 Sep 2017 23:50:19 +0000 (23:50 +0000)]
Fix handling of EGL_NONE as color space
am: 0d4e616c35

Change-Id: I66cc2f4b168ad67ef3e636a6be34416204cd4274

6 years agoFix handling of EGL_NONE as color space
Courtney Goeltzenleuchter [Mon, 11 Sep 2017 19:06:48 +0000 (13:06 -0600)]
Fix handling of EGL_NONE as color space

Color space of EGL_NONE was getting passed down and
driver threw EGL_BAD_ATTRIBUTE in response.
Issue was caused when changing the colorspace from nullptr
to EGL_NONE, missed a couple of places that needed to
test against EGL_NONE instead of nullptr.

Bug: 65376495
Test: adb -d shell am start \
          -n com.drawelements.deqp/android.app.NativeActivity \
          -e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
          --deqp-log-filename=/sdcard/dEQP-Log.qpa"'

Change-Id: If8812725be9d3858bf610c647ba53ff38944dd50

6 years agoMerge changes Id437e220,I9d6b3fba am: 94b6d11640 am: 8a7aa6197d
Kenneth Graunke [Mon, 11 Sep 2017 19:45:03 +0000 (19:45 +0000)]
Merge changes Id437e220,I9d6b3fba am: 94b6d11640 am: 8a7aa6197d
am: ffb306c748

Change-Id: Ifb89181d89ede9381a23e3a3a4a4ce8763ad1a0c

6 years agoMerge changes Id437e220,I9d6b3fba am: 94b6d11640
Kenneth Graunke [Mon, 11 Sep 2017 19:40:36 +0000 (19:40 +0000)]
Merge changes Id437e220,I9d6b3fba am: 94b6d11640
am: 8a7aa6197d

Change-Id: I265da403e05540802aa8f9502c5c0466cf2e0c1b

6 years agoMerge "Use 64-bit math in work group size assertion." am: bc6743fe27 am: 6c4a5cde18
Kenneth Graunke [Mon, 11 Sep 2017 19:36:05 +0000 (19:36 +0000)]
Merge "Use 64-bit math in work group size assertion." am: bc6743fe27 am: 6c4a5cde18
am: b7d0eae501

Change-Id: Id2ce8783b91da42161b40acc26bd751f8333432b

6 years agoMerge changes Id437e220,I9d6b3fba
Kenneth Graunke [Mon, 11 Sep 2017 19:36:02 +0000 (19:36 +0000)]
Merge changes Id437e220,I9d6b3fba
am: 94b6d11640

Change-Id: Ide9468359dc4bdfd9e47a3f5f3aaa345d8096cd8

6 years agoMerge "Delete incorrect invalid map tests." am: 6352f3c7c0 am: 5b357ce430
Kenneth Graunke [Mon, 11 Sep 2017 19:35:51 +0000 (19:35 +0000)]
Merge "Delete incorrect invalid map tests." am: 6352f3c7c0 am: 5b357ce430
am: 223859f5a9

Change-Id: I4e6c265c3b17769b9ba3dcda83323d63fab8217b

6 years agoMerge "Use 64-bit math in work group size assertion." am: bc6743fe27
Kenneth Graunke [Mon, 11 Sep 2017 19:31:58 +0000 (19:31 +0000)]
Merge "Use 64-bit math in work group size assertion." am: bc6743fe27
am: 6c4a5cde18

Change-Id: I2894fbf53a863b6a76281cbe9b7a9614c671dc7f

6 years agoMerge "Delete incorrect invalid map tests." am: 6352f3c7c0
Kenneth Graunke [Mon, 11 Sep 2017 19:31:44 +0000 (19:31 +0000)]
Merge "Delete incorrect invalid map tests." am: 6352f3c7c0
am: 5b357ce430

Change-Id: I7b1f588efdb92ad1c00b6b66d3377df6de184356

6 years agoMerge changes Id437e220,I9d6b3fba
Treehugger Robot [Mon, 11 Sep 2017 19:30:30 +0000 (19:30 +0000)]
Merge changes Id437e220,I9d6b3fba

* changes:
  Allow ES 3.2 contexts to run sRGB write control unsupported test.
  Require GL_EXT_sRGB_write_control for GL_FRAMEBUFFER_SRGB enable/disable

6 years agoMerge "Use 64-bit math in work group size assertion."
Kenneth Graunke [Mon, 11 Sep 2017 19:27:27 +0000 (19:27 +0000)]
Merge "Use 64-bit math in work group size assertion."
am: bc6743fe27

Change-Id: I8852b7cb4f89e1a7500cf5e216731a9b9f10ae31

6 years agoMerge "Delete incorrect invalid map tests."
Kenneth Graunke [Mon, 11 Sep 2017 19:27:13 +0000 (19:27 +0000)]
Merge "Delete incorrect invalid map tests."
am: 6352f3c7c0

Change-Id: I66916c3bcd4a064719062e3bb87c24c5f6ac2414

6 years agoMerge "Use 64-bit math in work group size assertion."
Treehugger Robot [Mon, 11 Sep 2017 18:58:52 +0000 (18:58 +0000)]
Merge "Use 64-bit math in work group size assertion."

6 years agoMerge "Delete incorrect invalid map tests."
Treehugger Robot [Mon, 11 Sep 2017 18:57:22 +0000 (18:57 +0000)]
Merge "Delete incorrect invalid map tests."

6 years agoAllow ES 3.2 contexts to run sRGB write control unsupported test.
Kenneth Graunke [Sat, 9 Sep 2017 06:30:15 +0000 (23:30 -0700)]
Allow ES 3.2 contexts to run sRGB write control unsupported test.

GL_EXT_sRGB_write_control functionality is not part of ES 3.2.
So there's no need to restrict this to older contexts.

Affects:
dEQP-GLES31.functional.fbo.srgb_write_control.framebuffer_srgb_unsupported_enum

Components: AOSP

Change-Id: Id437e220958c66acf65fd5c40004e1fde13fdf64

6 years agoRequire GL_EXT_sRGB_write_control for GL_FRAMEBUFFER_SRGB enable/disable
Kenneth Graunke [Sat, 9 Sep 2017 06:26:15 +0000 (23:26 -0700)]
Require GL_EXT_sRGB_write_control for GL_FRAMEBUFFER_SRGB enable/disable

This test required GL_EXT_sRGB_write_control or ES 3.2.  But glEnable
and glDisable of GL_FRAMEBUFFER_SRGB requires the extension - ES 3.2
doesn't provide that functionality.  ES 3.2 implementations without the
extension would fail.  Now they report NotSupported.

Affects:
dEQP-GLES31.functional.fbo.srgb_write_control.framebuffer_srgb_enabled

Components: AOSP

Change-Id: I9d6b3fba892288354620ecbbc51ef7a351507e43

6 years agoFix regressions in synchronization tests for dedicated allocations
Slawomir Cygan [Sat, 9 Sep 2017 00:09:53 +0000 (00:09 +0000)]
Fix regressions in synchronization tests for dedicated allocations
am: 0e4f9f242d

Change-Id: Iec7cca8af632a5d29a19a5a48b34423f5a764359

6 years agoDelete incorrect invalid map tests.
Kenneth Graunke [Fri, 8 Sep 2017 22:37:38 +0000 (15:37 -0700)]
Delete incorrect invalid map tests.

The citation given in these tests comes from the OpenGL man pages, which
are not authoritative.  The ES 3.2 specification says:

   "6.3.2 Effects of Mapping Buffers on Other GL Commands

    Any GL command which attempts to read from, write to, or change the
    state of a buffer object may generate an INVALID_OPERATION error if
    all or part of the buffer object is mapped. However, only commands
    which explicitly describe this error are required to do so. If an
    error is not generated, using such commands to perform invalid
    reads, writes, or state changes will have undefined results and may
    result in GL interruption or termination."

Importantly, it says "_may_ generate an INVALID_OPERATION error".  Some
drivers choose not to implement this to avoid the CPU overhead required
to enforce this optional restriction.

Affects:
- dEQP-GLES31.functional.debug.negative_coverage.*.vertex_array.*_invalid_map

Components: AOSP

Change-Id: I26eb6ac0dfffbfc50612bed44d1beb6eb3d366c9

6 years agoMerge "Relax EGL functional test thresholds" am: a1ec716449 am: db760778a9
james.glanville [Fri, 8 Sep 2017 21:43:03 +0000 (21:43 +0000)]
Merge "Relax EGL functional test thresholds" am: a1ec716449 am: db760778a9
am: 6fe520433d

Change-Id: I2cfe51fd9842c7c0d4dbae1482a0506c3d5eaf7b

6 years agoMerge "Relax EGL functional test thresholds" am: a1ec716449
james.glanville [Fri, 8 Sep 2017 21:41:01 +0000 (21:41 +0000)]
Merge "Relax EGL functional test thresholds" am: a1ec716449
am: db760778a9

Change-Id: I997bdf950f65300a677703b54ed6262702e52a73

6 years agoMerge "Relax EGL functional test thresholds"
james.glanville [Fri, 8 Sep 2017 21:39:27 +0000 (21:39 +0000)]
Merge "Relax EGL functional test thresholds"
am: a1ec716449

Change-Id: I719ba3fa67da541722ac65f2b5d2c847b98824e0

6 years agoMerge "Relax EGL functional test thresholds"
Treehugger Robot [Fri, 8 Sep 2017 21:25:48 +0000 (21:25 +0000)]
Merge "Relax EGL functional test thresholds"

6 years agoUse 64-bit math in work group size assertion.
Kenneth Graunke [Thu, 13 Jul 2017 01:44:11 +0000 (18:44 -0700)]
Use 64-bit math in work group size assertion.

If the maximum workgroup size in each dimension is large enough, this
can overflow, causing the comparison to fail.  For example, on Intel
Haswell, we get:

   assert(2048 * 2048 * 2048 > 2048) -> assert(0 > 2048) -> fail

Casting one value to deInt64 causes the multiplications to occur as
64-bit values, so we don't overflow.

Affects:

dEQP-GLES31.functional.debug.negative_coverage.*.compute.invalid_maximum_work_group_sizes

Components: AOSP

Change-Id: Ie03627a378f4fdc46ce241bbdd3693ae829c217d

6 years agoFix regressions in synchronization tests for dedicated allocations
Slawomir Cygan [Mon, 31 Jul 2017 12:22:50 +0000 (14:22 +0200)]
Fix regressions in synchronization tests for dedicated allocations

Pass image memory requirements to allocation routine in allocateAndBindMemory.

VK_KHR_get_memory_requirements2 is a device extension (not instance).

Throw NotSupported when external handle requires dedicated allocation,
but 'suballocated' variant of test is being run.

Affects:
dEQP-VK.synchronization.cross_instance.*

Components: Vulkan

VK-GL-CTS issue: 604
Bug: 65490152
Bug: 65202260
Test: Ran tests on couple of Google devices
Change-Id: I3636779459300f5dee2e22b0a2e04762eb7b0601

6 years agoRelax EGL functional test thresholds
james.glanville [Tue, 29 Aug 2017 10:40:53 +0000 (11:40 +0100)]
Relax EGL functional test thresholds

The current threshold of 0.02 was selected as suitable for 8-bit color depths.
However, for smaller bit depths such as RGB565 this threshold is too strict
and it has been relaxed to allow a larger error for low bit depth formats.

Affects:
dEQP-EGL.functional.render.*

Change-Id: I6d6e061be02bc8e63cb5d9662feb804bc839d567

6 years agoFix flakiness in mailbox.display_timing
Ian Elliott [Thu, 7 Sep 2017 21:15:30 +0000 (21:15 +0000)]
Fix flakiness in mailbox.display_timing
am: 311129dc01

Change-Id: I3729de1b2b236c54e6008901c485e5c65c9d8f5d

6 years agoFix flakiness in mailbox.display_timing
Ian Elliott [Wed, 16 Aug 2017 21:11:57 +0000 (15:11 -0600)]
Fix flakiness in mailbox.display_timing

The "vktWsiDisplayTimingTests.cpp" file was originally written just for
a present mode of VK_PRESENT_MODE_FIFO_KHR.  It has a case at image 80,
where it changes the desiredPresentTime to be 1 second earlier, and then
checks that later.  Such a check doesn't work with
VK_PRESENT_MODE_MAILBOX_KHR, which can throw off the timing of images
(because some images may not be presented).  This has resulted in the
test having random failures.  The "image 80 test" wasn't intended to
occur with MAILBOX, and so it's now being removed.

VK-GL-CTS issue: 622
Components: Vulkan
Affects: dEQP-VK.wsi.*.display_timing.mailbox.display_timing
Bug: 64486630
Test: Build cts and ran scripts/check_build_sanity.py

Change-Id: I9fbd2254b4e6fc1c7bff077c8c0a5229a6d74800

6 years agoMerge "Check for EGL_KHR_gl_colorspace before using it" into oc-mr1-dev
Courtney Goeltzenleuchter [Wed, 6 Sep 2017 21:36:16 +0000 (21:36 +0000)]
Merge "Check for EGL_KHR_gl_colorspace before using it" into oc-mr1-dev
am: e0000e9fa5

Change-Id: I4dda3ae340a7019ab7e4dde0fa49bfc34c06ca41

6 years agoMerge "Check for EGL_KHR_gl_colorspace before using it" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 20:36:37 +0000 (20:36 +0000)]
Merge "Check for EGL_KHR_gl_colorspace before using it" into oc-mr1-dev

6 years agoCheck for EGL_KHR_gl_colorspace before using it am: 2cf32ffa6e am: e3992de385
Courtney Goeltzenleuchter [Wed, 6 Sep 2017 16:53:27 +0000 (16:53 +0000)]
Check for EGL_KHR_gl_colorspace before using it am: 2cf32ffa6e am: e3992de385
am: 0353c8a186

Change-Id: Ie07301231b7c37b8b977d671f048d4fb00b20132

6 years agoCheck for EGL_KHR_gl_colorspace before using it am: 2cf32ffa6e
Courtney Goeltzenleuchter [Wed, 6 Sep 2017 16:47:58 +0000 (16:47 +0000)]
Check for EGL_KHR_gl_colorspace before using it am: 2cf32ffa6e
am: e3992de385

Change-Id: Ia9a47fb3071a9c7d679bebc7343d551c4c7e0317

6 years agoCheck for EGL_KHR_gl_colorspace before using it
Courtney Goeltzenleuchter [Wed, 6 Sep 2017 16:45:57 +0000 (16:45 +0000)]
Check for EGL_KHR_gl_colorspace before using it
am: 2cf32ffa6e

Change-Id: I862ea02e9803fc946a2e71e3145d806f76278676

6 years agoMerge changes Iee2918c1,I3a98fe12 into oc-mr1-dev
Mika Isojarvi [Wed, 6 Sep 2017 16:40:54 +0000 (16:40 +0000)]
Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev
am: 77827f4212

Change-Id: I26434955a5eb8f2648ceb3f082374db627d358f4

6 years agoMerge changes Iee2918c1,I3a98fe12 into oc-mr1-dev
Mika Isojarvi [Wed, 6 Sep 2017 16:32:19 +0000 (16:32 +0000)]
Merge changes Iee2918c1,I3a98fe12 into oc-mr1-dev

* changes:
  Fix unused uniform bug in EGL robustness tests
  Fix missing SSBO binding in EGL robustness tests

6 years agoCheck for EGL_KHR_gl_colorspace before using it
Courtney Goeltzenleuchter [Tue, 5 Sep 2017 23:48:27 +0000 (17:48 -0600)]
Check for EGL_KHR_gl_colorspace before using it

Bug: 65376495
Test: adb -d shell am start \
        -n com.drawelements.deqp/android.app.NativeActivity \
        -e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
        --deqp-log-filename=/sdcard/dEQP-Log.qpa"'

Change-Id: Ief654c998e93d72899225120b0ca1ab2fa3ca624
(cherry picked from commit 2cf32ffa6ee9daf7f58e34c1b874f4005e4b888f)

6 years agoCheck for EGL_KHR_gl_colorspace before using it
Courtney Goeltzenleuchter [Tue, 5 Sep 2017 23:48:27 +0000 (17:48 -0600)]
Check for EGL_KHR_gl_colorspace before using it

Bug: 65376495
Test: adb -d shell am start \
        -n com.drawelements.deqp/android.app.NativeActivity \
        -e cmdLine '"deqp --deqp-case=dEQP-EGL.functional.wide_color.* \
        --deqp-log-filename=/sdcard/dEQP-Log.qpa"'

Change-Id: Ief654c998e93d72899225120b0ca1ab2fa3ca624

6 years agoMerge "Add more allowed 'dot' alternatives" am: 7e8c3b2d00 am: c6aef79622
Alexander Galazin [Tue, 5 Sep 2017 21:49:01 +0000 (21:49 +0000)]
Merge "Add more allowed 'dot' alternatives" am: 7e8c3b2d00 am: c6aef79622
am: 2cb24164fd

Change-Id: I96e76b5181661995bd85b235fb61501962be239e

6 years agoMerge "Add more allowed 'dot' alternatives" am: 7e8c3b2d00
Alexander Galazin [Tue, 5 Sep 2017 21:47:03 +0000 (21:47 +0000)]
Merge "Add more allowed 'dot' alternatives" am: 7e8c3b2d00
am: c6aef79622

Change-Id: I498ba85cd282a17b9fdb8a3c5381981a45521739

6 years agoMerge "Add more allowed 'dot' alternatives"
Alexander Galazin [Tue, 5 Sep 2017 21:44:31 +0000 (21:44 +0000)]
Merge "Add more allowed 'dot' alternatives"
am: 7e8c3b2d00

Change-Id: I8ea74cc7658e034905be82c02fafc7f01b4e3705

6 years agoMerge "Add more allowed 'dot' alternatives"
Treehugger Robot [Tue, 5 Sep 2017 21:35:29 +0000 (21:35 +0000)]
Merge "Add more allowed 'dot' alternatives"

6 years agoMerge "resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp" into oc-mr1...
TreeHugger Robot [Tue, 5 Sep 2017 20:15:32 +0000 (20:15 +0000)]
Merge "resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp

6 years agoFix unused uniform bug in EGL robustness tests am: 7806d74666 am: 32fe3869a7
Mika Isojrvi [Tue, 5 Sep 2017 19:51:23 +0000 (19:51 +0000)]
Fix unused uniform bug in EGL robustness tests am: 7806d74666 am: 32fe3869a7
am: df1b7de4fd

Change-Id: Ie4698293df88165583c7cf4e81e28b6b93506d70

6 years agoFix unused uniform bug in EGL robustness tests am: 7806d74666
Mika Isojrvi [Tue, 5 Sep 2017 19:49:21 +0000 (19:49 +0000)]
Fix unused uniform bug in EGL robustness tests am: 7806d74666
am: 32fe3869a7

Change-Id: Ic02f5be9192c5295cc56be26f06cd76bf2e6bdde

6 years agoFix unused uniform bug in EGL robustness tests
Mika Isojrvi [Tue, 5 Sep 2017 19:47:23 +0000 (19:47 +0000)]
Fix unused uniform bug in EGL robustness tests
am: 7806d74666

Change-Id: I7bdb3742437ed0abe590f5c011bf1b78cade9419

6 years agoresolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp
Mika Isojärvi [Tue, 5 Sep 2017 18:15:08 +0000 (11:15 -0700)]
resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp

Test: Ran check_build_sanity.py.
Change-Id: I57546248a0851acf9bfdae0ce560e4a2006f2141

6 years agoMerge "Fix missing SSBO binding in EGL robustness tests" am: e19c3ff127 am: fb660dc26b
Mika Isojärvi [Tue, 5 Sep 2017 17:51:14 +0000 (17:51 +0000)]
Merge "Fix missing SSBO binding in EGL robustness tests" am: e19c3ff127 am: fb660dc26b
am: 5ac30afb48

Change-Id: I42cf1fabd5887d784eb68f67b68af624788625a8