mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 13:23:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rutabaga_gfx: nuke fake capset

Browse source 
All Android guests have been updated.

BUG=b:239639751
TEST=compile

Change-Id: Ic1d6e7bc338335d3afd36d8d70f6f291a24cc63f
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3892130
Auto-Submit: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
Gurchetan Singh 2022-09-12 10:18:26 -07:00 committed by crosvm LUCI
parent 7c6d8bec3f
commit 8ab7d9b715
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
rutabaga_gfx/src/rutabaga_core.rs
View file

@ -210,7 +210,7 @@ struct RutabagaCapsetInfo {
pub name: &'static str, pub name: &'static str,
} }
const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 7] = [ const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 6] = [
RutabagaCapsetInfo { RutabagaCapsetInfo {
capset_id: RUTABAGA_CAPSET_VIRGL, capset_id: RUTABAGA_CAPSET_VIRGL,
component: RutabagaComponentType::VirglRenderer, component: RutabagaComponentType::VirglRenderer,
@ -236,11 +236,6 @@ const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 7] = [
component: RutabagaComponentType::CrossDomain, component: RutabagaComponentType::CrossDomain,
name: "cross-domain", name: "cross-domain",
}, },
RutabagaCapsetInfo {
capset_id: 30,
component: RutabagaComponentType::CrossDomain,
name: "minigbm-cross-domain",
},
RutabagaCapsetInfo { RutabagaCapsetInfo {
capset_id: RUTABAGA_CAPSET_DRM, capset_id: RUTABAGA_CAPSET_DRM,
component: RutabagaComponentType::VirglRenderer, component: RutabagaComponentType::VirglRenderer,
@ -256,13 +251,6 @@ pub fn calculate_context_mask(context_names: Vec<String>) -> u64 {
}; };
}); });
// TODO remove once
// https://android-review.googlesource.com/c/platform/external/minigbm/+/2101455
// is picked back to rvc-arc branch:
if context_mask & (1 << RUTABAGA_CAPSET_DRM) != 0 {
context_mask |= 1 << 30;
}
context_mask context_mask
} }
@ -964,7 +952,6 @@ impl RutabagaBuilder {
let cross_domain = CrossDomain::init(self.channels)?; let cross_domain = CrossDomain::init(self.channels)?;
rutabaga_components.insert(RutabagaComponentType::CrossDomain, cross_domain); rutabaga_components.insert(RutabagaComponentType::CrossDomain, cross_domain);
push_capset(RUTABAGA_CAPSET_CROSS_DOMAIN); push_capset(RUTABAGA_CAPSET_CROSS_DOMAIN);
push_capset(30);
} }
Ok(Rutabaga { Ok(Rutabaga {