| commit | e300b83aaaa50fe531092867a782b7b49a8a6958 | [log] [tgz] |
|---|---|---|
| author | Jason Macnak <natsu@google.com> | Thu Sep 30 09:47:06 2021 -0700 |
| committer | Jason Macnak <natsu@google.com> | Thu Sep 30 09:47:06 2021 -0700 |
| tree | b379ff5a7191af242de01a1a3fa176c837d42ad6 | |
| parent | a4cc189fc90800ea8a32bca4cb4976d7f9810223 [diff] | |
| parent | 04c8f511449d4ebe714d293b09e434d7295981e4 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master' ... to update Minigbm for Cuttlefish to pull in clean ups for supported combinations and to pull in restricting 2D allocs to max supported SwiftShader/llvmpipe size. Bug: b/201325625 Bug: b/194426249 Test: launch_cvd --gpu_mode=guest_swiftshader Test: launch_cvd --gpu_mode=gfxstream Change-Id: I11c71b95987cedbb27515e85559e00c5df8c0dd9