Android Build Merger (Role) [Fri, 20 Jan 2017 20:35:44 +0000 (20:35 +0000)]
Merge "Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35 am:
436488b78f" into nyc-mr1-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:35:36 +0000 (20:35 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9 am:
0b9596cb35
am:
436488b78f
Change-Id: I90af52af5cefd7ca0302f0fd3d1eccb7a1a6934f
Android Build Merger (Role) [Fri, 20 Jan 2017 20:35:30 +0000 (20:35 +0000)]
Merge "Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770 am:
0dbb18ee84" into nyc-mr1-dev-plus-aosp
Alexander Galazin [Fri, 20 Jan 2017 20:35:25 +0000 (20:35 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1 am:
0e7da13770
am:
0dbb18ee84
Change-Id: Iaa60e3cbe62a1ac83550fbe8604cdc99a94d72cf
Android Build Merger (Role) [Fri, 20 Jan 2017 20:35:19 +0000 (20:35 +0000)]
Merge "Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf am:
ee10cd68f7" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 20:35:17 +0000 (20:35 +0000)]
Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours am:
2c6307af33 -s ours" into nyc-mr1-dev-plus-aosp
Tina Zhou [Fri, 20 Jan 2017 20:35:11 +0000 (20:35 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1 am:
5debc545bf
am:
ee10cd68f7
Change-Id: I28e63d9f2f5b5b71981a7115d0bfc50b45b3c8b4
Tina Zhou [Fri, 20 Jan 2017 20:35:11 +0000 (20:35 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours am:
1d2a009979 -s ours
am:
2c6307af33 -s ours
Change-Id: Iecf16e40a8690aa3bd9d4cb8e4ba0cb34bd37558
Android Build Merger (Role) [Fri, 20 Jan 2017 20:34:47 +0000 (20:34 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours am:
7bab558fb8 -s ours" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 20 Jan 2017 20:34:46 +0000 (20:34 +0000)]
Merge "Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030 am:
04d8a8e98a" into nyc-mr1-dev-plus-aosp
Pyry Haulos [Fri, 20 Jan 2017 20:34:41 +0000 (20:34 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours am:
55fe6e8997 -s ours
am:
7bab558fb8 -s ours
Change-Id: I6a40dd9ca99dfb10ea59d368dad6e2d1e9c093c4
Pyry Haulos [Fri, 20 Jan 2017 20:34:39 +0000 (20:34 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487 am:
90c49fe030
am:
04d8a8e98a
Change-Id: I33b01b0e214df343d63c2876aeb2e5698ad84627
Tina Zhou [Fri, 20 Jan 2017 20:34:27 +0000 (20:34 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
ea7ea6aeee
am:
562348c4a0
Change-Id: Ie4b8d4ea6a5d36c4ca5d50e1de41688d07c2b880
Alexander Galazin [Fri, 20 Jan 2017 20:34:16 +0000 (20:34 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
b1c225b9d6
am:
f8e27c683d
Change-Id: I056321401e4a6609873ab21b2b816cfbc938afd0
Tina Zhou [Fri, 20 Jan 2017 20:32:02 +0000 (20:32 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf -s ours
am:
1d2a009979 -s ours
Change-Id: Ie406079ab3058b2203dbb3811194c086a595f858
Pyry Haulos [Fri, 20 Jan 2017 20:31:48 +0000 (20:31 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690 -s ours
am:
55fe6e8997 -s ours
Change-Id: I13085ccdcd995b71cbffdb619de4421ef7918da9
Tina Zhou [Fri, 20 Jan 2017 20:31:32 +0000 (20:31 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
487543e953
am:
ed835f32e2
Change-Id: I7adf853a3416fc7e19755eb5fd1566145e028c41
Tina Zhou [Fri, 20 Jan 2017 20:31:31 +0000 (20:31 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66
am:
ea7ea6aeee
Change-Id: I45a83cc65cfe838f11d13cac80bdc18ae9fed0fa
Alexander Galazin [Fri, 20 Jan 2017 20:31:19 +0000 (20:31 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca
am:
b1c225b9d6
Change-Id: I9305006c741bbb4109c54b3187473bab91fe4cfb
Pyry Haulos [Fri, 20 Jan 2017 20:31:19 +0000 (20:31 +0000)]
resolve merge conflicts of
ba455914 to master am:
07a7e24da3
am:
218bfe74ff
Change-Id: Iefd1538e6ac00feea390b305bfe1c734024033cc
Tina Zhou [Fri, 20 Jan 2017 20:30:03 +0000 (20:30 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657
am:
487543e953
Change-Id: I4e1060cc6c204387f1520a40b97fa061a9044241
Pyry Haulos [Fri, 20 Jan 2017 20:29:48 +0000 (20:29 +0000)]
resolve merge conflicts of
ba455914 to master
am:
07a7e24da3
Change-Id: Iece28ec157fd5f603009ffb6fc9023cc0164ab1d
Tina Zhou [Fri, 20 Jan 2017 20:28:13 +0000 (20:28 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
am:
e98444b9bf -s ours
Change-Id: I35eea6598260946f05bec754e9a627c263cad2f0
Pyry Haulos [Fri, 20 Jan 2017 20:28:12 +0000 (20:28 +0000)]
Remove tests affected by NV/OES_viewport_array extension
am:
267c765690 -s ours
Change-Id: I8f9d7aef632660fe6201035d381485072dbee063
Tina Zhou [Fri, 20 Jan 2017 20:27:56 +0000 (20:27 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
am:
61d6d95a66
Change-Id: I1eb46e5e8e20d1f35eb7c0234e97aa0f0d8c1ea1
Alexander Galazin [Fri, 20 Jan 2017 20:27:55 +0000 (20:27 +0000)]
Generate flat triangles in polygon offset tests.
am:
975a59ebca
Change-Id: Ia1226e8da8462deb895b6e7e8113db5fd500565f
Tina Zhou [Fri, 20 Jan 2017 20:27:45 +0000 (20:27 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
am:
312a550657
Change-Id: Ic9ad221d68e82f4b2fc31a6ca51f21fc731ca31d
Tina Zhou [Fri, 20 Jan 2017 18:46:06 +0000 (18:46 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4 am:
e892f4b76d
am:
5322472db4
Change-Id: I17a1b152115571dd492dc72c0f99fd272224b7f7
Nicolas Boichat [Fri, 20 Jan 2017 18:45:53 +0000 (18:45 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530 am:
03a8c9c6f8
am:
6e6f163b3b
Change-Id: I53fa00969a264ea715e3f2399dcc834bdf68c648
Tina Zhou [Fri, 20 Jan 2017 18:45:41 +0000 (18:45 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f am:
c51b8d9aed
am:
ca62006a36
Change-Id: I35f4dd69bb5505b43ea094e552bd5e931e0a2803
Kenneth Graunke [Fri, 20 Jan 2017 18:45:29 +0000 (18:45 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698 am:
b7e9123835
am:
8d840f0bad
Change-Id: I721340b243d0dc83a5b38b7eb812d22ca865a2cb
Tina Zhou [Fri, 20 Jan 2017 18:45:19 +0000 (18:45 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149 am:
941703d7ac
am:
f118f42c24
Change-Id: Ibef92f208dbe3494855c4a99df9231f773db3615
Pyry Haulos [Fri, 20 Jan 2017 18:45:02 +0000 (18:45 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7 am:
58dd13c4bd
am:
fee7030974
Change-Id: Ia726b40126f2c236ad09771608bdedc526dbbbc4
Tina Zhou [Fri, 20 Jan 2017 18:44:45 +0000 (18:44 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750 am:
842ee2b145
am:
c9c5b8e584
Change-Id: I66c81804cf252d4fa72add8676f15fb6874a808f
Kenneth Graunke [Fri, 20 Jan 2017 18:44:35 +0000 (18:44 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887 am:
c05194f0c9
am:
b33cfac0b1
Change-Id: I5fde28fe60d630f3bd7822c203ba4b09895092f6
Tina Zhou [Fri, 20 Jan 2017 18:44:24 +0000 (18:44 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455 am:
57763dc162
am:
24141a0482 -s ours
Change-Id: I13df84dda146ef5421308701446209fe6ba6db5c
Mark Adams [Fri, 20 Jan 2017 18:44:13 +0000 (18:44 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2 am:
69a929f82c
am:
c68e6bbdef -s ours
Change-Id: I3fcab53906b9583971cb162d16cedec0620d5bde
Tina Zhou [Fri, 20 Jan 2017 18:42:13 +0000 (18:42 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66 am:
73b7f271a9
am:
0b9596cb35
Change-Id: I0011a5976771ef57668f3b45c580f05a835c43ca
Alexander Galazin [Fri, 20 Jan 2017 18:42:03 +0000 (18:42 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca am:
02c67b12c1
am:
0e7da13770
Change-Id: Ic1b590795bdc10712f20eeb9f47404b50f300082
Tina Zhou [Fri, 20 Jan 2017 18:41:53 +0000 (18:41 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657 am:
36d3dd2ab1
am:
5debc545bf
Change-Id: I4ac4eb2d83d571c42feb4cdd147831f43595ed9a
Pyry Haulos [Fri, 20 Jan 2017 18:41:41 +0000 (18:41 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407 am:
a11fd8b487
am:
90c49fe030
Change-Id: I98c05dddbdfc48b3f1f836e86de5978e47d11c08
Tina Zhou [Fri, 20 Jan 2017 18:41:40 +0000 (18:41 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
cc65e08407
am:
be674b63ba
Change-Id: Ie56ee078d19e99c4d66776af75d2b2b9e3504572
Tina Zhou [Fri, 20 Jan 2017 18:41:30 +0000 (18:41 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a am:
839be6fae4
am:
e892f4b76d
Change-Id: Ifaee5458fe5437fd1fe843e9a5fd7d5e6b3d99d9
Nicolas Boichat [Fri, 20 Jan 2017 18:41:27 +0000 (18:41 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
2792165177
am:
298b7abce5
Change-Id: Ifc8665eea44536c377af808783db47ee3e8613f6
Nicolas Boichat [Fri, 20 Jan 2017 18:41:17 +0000 (18:41 +0000)]
Fix eglBindAPI negative test am:
09784f8510 am:
b7b2f00530
am:
03a8c9c6f8
Change-Id: Ic9bfa6ee3a6ba6094a5a9f505c69fca02751a974
Tina Zhou [Fri, 20 Jan 2017 18:41:16 +0000 (18:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 -s ours am:
7e8c7d9b65
am:
dd6ff4b8da
Change-Id: I8ce74f8b664c49c3eff5f37852273dab5e761235
Tina Zhou [Fri, 20 Jan 2017 18:41:07 +0000 (18:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 am:
b3f5df9d8f
am:
c51b8d9aed
Change-Id: Iebfad13ffbabdce0d1225dba1a5a7e7eef61a5f0
Kenneth Graunke [Fri, 20 Jan 2017 18:41:02 +0000 (18:41 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 -s ours am:
727bdb2369
am:
5722a54979
Change-Id: I3f19018a1cca7dbe2e792a9e9d2688f96f072eed
Tina Zhou [Fri, 20 Jan 2017 18:40:51 +0000 (18:40 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
e8956e54ae
am:
38c76f88d2
Change-Id: Iedd9d5906f75f67c92a095d67f32ab45534b7f73
Kenneth Graunke [Fri, 20 Jan 2017 18:40:48 +0000 (18:40 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 am:
9df734d698
am:
b7e9123835
Change-Id: Idfa304af7fc533f4fcfd620727ec2915db376962
Pyry Haulos [Fri, 20 Jan 2017 18:40:39 +0000 (18:40 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
1f1eac5e9e
am:
b925a5dac5
Change-Id: Ide8d276195efc19e60c14db779c42dbf2e3dc985
Tina Zhou [Fri, 20 Jan 2017 18:40:38 +0000 (18:40 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99 am:
27b237e149
am:
941703d7ac
Change-Id: I4f1c9a3aaf13075bea436da17673256ea79bc0cd
Pyry Haulos [Fri, 20 Jan 2017 18:40:26 +0000 (18:40 +0000)]
Optimize swapchain OOM tests am:
1614827a71 am:
c4cd6ba5e7
am:
58dd13c4bd
Change-Id: I73140e4f04757e3b08d64eff88d70360abf8a52a
Tina Zhou [Fri, 20 Jan 2017 18:40:19 +0000 (18:40 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
98d1096b90
am:
cce2a7ac8a
Change-Id: I3b8f86192c8522c47726997892b66a0dda96f997
Tina Zhou [Fri, 20 Jan 2017 18:40:12 +0000 (18:40 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1 am:
0a2fc88750
am:
842ee2b145
Change-Id: I509b02768c89111e15c3f541336aee990dc88ecb
Kenneth Graunke [Fri, 20 Jan 2017 18:40:04 +0000 (18:40 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
bd1ce838a0
am:
f39baeb2fe
Change-Id: Ic2e1968001c79669416b89acebbcb46af22672c7
Kenneth Graunke [Fri, 20 Jan 2017 18:40:02 +0000 (18:40 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f am:
ad563bc887
am:
c05194f0c9
Change-Id: I2135b0d06636da98797a4e92b79967b761409714
Tina Zhou [Fri, 20 Jan 2017 18:39:49 +0000 (18:39 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc -s ours am:
306e8af13e -s ours
am:
f067fabd45 -s ours
Change-Id: I8517c1264767fc2bf5169025db2c7e34738aed70
Tina Zhou [Fri, 20 Jan 2017 18:39:48 +0000 (18:39 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc am:
4fc6c2e455
am:
57763dc162
Change-Id: Icba07b9c2e1c05c3e506b282461b0eecbf8e6c80
Mark Adams [Fri, 20 Jan 2017 18:39:36 +0000 (18:39 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
28a6ef5df2
am:
69a929f82c
Change-Id: Ie2e9501067f41c0548ae25365f8d0043cf0749d2
Mark Adams [Fri, 20 Jan 2017 18:39:36 +0000 (18:39 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 -s ours am:
509b577c43 -s ours
am:
8d2e58f7d4 -s ours
Change-Id: I662ddce9510b4a25b2000add03711d3d9df3232f
Tina Zhou [Fri, 20 Jan 2017 18:37:32 +0000 (18:37 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66
am:
73b7f271a9
Change-Id: I81f005b1da8dabe780d5f16e2b0b24f587286546
Alexander Galazin [Fri, 20 Jan 2017 18:37:21 +0000 (18:37 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca
am:
02c67b12c1
Change-Id: I86b9659a38fb029def1ab9c7de15c73f1e60473a
Tina Zhou [Fri, 20 Jan 2017 18:37:20 +0000 (18:37 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a
am:
cc65e08407
Change-Id: I1f0093e12f40b5e0e694b28833c815ea14174fa2
Tina Zhou [Fri, 20 Jan 2017 18:37:10 +0000 (18:37 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657
am:
36d3dd2ab1
Change-Id: I1328497673c38aefc8617ee7c555ae2b242edb53
Nicolas Boichat [Fri, 20 Jan 2017 18:37:07 +0000 (18:37 +0000)]
Fix eglBindAPI negative test am:
09784f8510
am:
2792165177
Change-Id: Ic7b93e76b3eed09c6a193dee9e99b5a60e327b2d
Pyry Haulos [Fri, 20 Jan 2017 18:36:59 +0000 (18:36 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407
am:
a11fd8b487
Change-Id: I559fa411bd3e9ab117e4fdacd466c03ead6c73da
Tina Zhou [Fri, 20 Jan 2017 18:36:48 +0000 (18:36 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a
am:
839be6fae4
Change-Id: I15e8699e526124806d63a299d9c5ce73fffd696f
Tina Zhou [Fri, 20 Jan 2017 18:36:41 +0000 (18:36 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2 -s ours
am:
7e8c7d9b65
Change-Id: Ifdf30f1ba3b3844a7bdcef1f039d17b02704e772
Nicolas Boichat [Fri, 20 Jan 2017 18:36:37 +0000 (18:36 +0000)]
Fix eglBindAPI negative test am:
09784f8510
am:
b7b2f00530
Change-Id: I87f03d37402abea5854ea8db14f847943ac306ba
Kenneth Graunke [Fri, 20 Jan 2017 18:36:30 +0000 (18:36 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874 -s ours
am:
727bdb2369
Change-Id: I5eec17ede97a0c83b4de7dbcc47e536a96ae3367
Tina Zhou [Fri, 20 Jan 2017 18:36:25 +0000 (18:36 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am:
3baf7e3be2
am:
b3f5df9d8f
Change-Id: Ie130b6d34ae0dcd24b2fa867d3631cc9428ef4ba
Tina Zhou [Fri, 20 Jan 2017 18:36:09 +0000 (18:36 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99
am:
e8956e54ae
Change-Id: I6035d3e7d62e1b49556abdcac6563f363f7164c3
Kenneth Graunke [Fri, 20 Jan 2017 18:36:08 +0000 (18:36 +0000)]
Drop incorrect framebuffer texture subtests. am:
625d685874
am:
9df734d698
Change-Id: Ideece41c3411c8a01ea403395edc851dc734c4db
Tina Zhou [Fri, 20 Jan 2017 18:35:58 +0000 (18:35 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am:
c811d42d99
am:
27b237e149
Change-Id: Id9d29d51ace7767e0b2a57a32d3f38379ed32900
Pyry Haulos [Fri, 20 Jan 2017 18:35:56 +0000 (18:35 +0000)]
Optimize swapchain OOM tests am:
1614827a71
am:
1f1eac5e9e
Change-Id: I7ad8770ac94694b57f07aef32b2235e67e05aa63
Pyry Haulos [Fri, 20 Jan 2017 18:35:48 +0000 (18:35 +0000)]
Optimize swapchain OOM tests am:
1614827a71
am:
c4cd6ba5e7
Change-Id: I61acabdc7d5696b4565e346143a189267ae0aeb8
Tina Zhou [Fri, 20 Jan 2017 18:35:45 +0000 (18:35 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1
am:
98d1096b90
Change-Id: I6f8ac25b96706a941610b386e2317dca15a33fbe
Tina Zhou [Fri, 20 Jan 2017 18:35:36 +0000 (18:35 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am:
0991459ed1
am:
0a2fc88750
Change-Id: I893215e862509b29f8fd3477fd513cb0ae87970d
Kenneth Graunke [Fri, 20 Jan 2017 18:35:35 +0000 (18:35 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f
am:
bd1ce838a0
Change-Id: Ie886fa96f1da7c960d0fbd8540e6e1fc196a6585
Kenneth Graunke [Fri, 20 Jan 2017 18:35:27 +0000 (18:35 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am:
2ed3a5a66f
am:
ad563bc887
Change-Id: I290e18b7ab69769c08fab421f022eeccc25a5e26
Tina Zhou [Fri, 20 Jan 2017 18:35:22 +0000 (18:35 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc -s ours
am:
306e8af13e -s ours
Change-Id: Ic85553551174fa4c8604b704b1030596351d7c90
Tina Zhou [Fri, 20 Jan 2017 18:35:16 +0000 (18:35 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc
am:
4fc6c2e455
Change-Id: I5e6511ecd304ecf0374cfb2078740c74629145cc
Mark Adams [Fri, 20 Jan 2017 18:35:10 +0000 (18:35 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 -s ours
am:
509b577c43 -s ours
Change-Id: I19d17f92ec3fc76ce56c84d04ea300ce8fcc37ac
Mark Adams [Fri, 20 Jan 2017 18:35:06 +0000 (18:35 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3
am:
28a6ef5df2
Change-Id: I737dc392ec39fa022166905d7af7f029da7e0c36
Pyry Haulos [Fri, 20 Jan 2017 18:34:24 +0000 (10:34 -0800)]
resolve merge conflicts of
ba455914 to master
Change-Id: Iad350278ba3cf6adcc0fa5e4914e8d98db71a567
Tina Zhou [Fri, 20 Jan 2017 18:31:53 +0000 (18:31 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev
am:
6068dfbf3a
Change-Id: I6830683be5c3f71a47c61202689daa9a98797632
Nicolas Boichat [Fri, 20 Jan 2017 18:31:52 +0000 (18:31 +0000)]
Fix eglBindAPI negative test
am:
09784f8510
Change-Id: I286c03b0221c479bf4c4e98a4122eb6fe7290526
Tina Zhou [Fri, 20 Jan 2017 18:31:40 +0000 (18:31 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
am:
3baf7e3be2 -s ours
Change-Id: I57408e9f40640fec25656024aad4a9a047b48e2b
Kenneth Graunke [Fri, 20 Jan 2017 18:31:39 +0000 (18:31 +0000)]
Drop incorrect framebuffer texture subtests.
am:
625d685874 -s ours
Change-Id: I7753f87b0fed949615678a5dda727814dcd6007b
Tina Zhou [Fri, 20 Jan 2017 18:31:25 +0000 (18:31 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev
am:
c811d42d99
Change-Id: Iff260b7a0cac1f300e09ae4799c0f0bb37e6fd16
Pyry Haulos [Fri, 20 Jan 2017 18:31:24 +0000 (18:31 +0000)]
Optimize swapchain OOM tests
am:
1614827a71
Change-Id: Ia597d433e2978dea15e46e5dd13cd7e723dd11c2
Tina Zhou [Fri, 20 Jan 2017 18:31:08 +0000 (18:31 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev
am:
0991459ed1
Change-Id: Iaad1f68482163e3e8940baf9139b29b66c4ed6f2
Kenneth Graunke [Fri, 20 Jan 2017 18:31:07 +0000 (18:31 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests.
am:
2ed3a5a66f
Change-Id: I979d7d709017237a7e201017b270aacaefc01013
Tina Zhou [Fri, 20 Jan 2017 18:30:48 +0000 (18:30 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
am:
61d6d95a66
Change-Id: Ia7141732269df847c13bbb8b36e9f911c76d8753
Alexander Galazin [Fri, 20 Jan 2017 18:30:47 +0000 (18:30 +0000)]
Generate flat triangles in polygon offset tests.
am:
975a59ebca
Change-Id: If91ab1b34f3215705636abaa4dc52ebad5d3d3a7
Tina Zhou [Fri, 20 Jan 2017 18:30:36 +0000 (18:30 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
am:
312a550657
Change-Id: Ia8465e3ae1fb9d80125305134c157857e5e339b1
Pyry Haulos [Fri, 20 Jan 2017 18:30:35 +0000 (18:30 +0000)]
Relax line width verification in primitive bbox tests
am:
ba45591407
Change-Id: Ia0f71e5511d1bf4bf449ef71ecf5bb822311cf08
Tina Zhou [Fri, 20 Jan 2017 18:30:23 +0000 (18:30 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev
am:
6068dfbf3a
Change-Id: I4ca862cbe3c17c0887437a98570f16e1bfc19d34
Nicolas Boichat [Fri, 20 Jan 2017 18:30:22 +0000 (18:30 +0000)]
Fix eglBindAPI negative test
am:
09784f8510
Change-Id: I9f1246736de39cfc6bc6593bad465fa881f55e29