gfxstream: delete magma-over-gfxstream
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
macOS-CI / macOS-CI (xlib) (push) Waiting to run

This was always meant to a be transitional approach.

Reviewed-by: Aaron Ruby <aruby@qnx.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37728>
This commit is contained in:
Gurchetan Singh 2025-10-06 14:11:33 -07:00 committed by Marge Bot
parent 5080f2b6f5
commit 05cd676287
5 changed files with 1 additions and 15 deletions

View file

@ -21,11 +21,6 @@ static bool GetRingParamsFromCapset(enum VirtGpuCapset capset, const VirtGpuCaps
bufferSize = caps.vulkanCapset.bufferSize;
blobAlignment = caps.vulkanCapset.blobAlignment;
break;
case kCapsetGfxStreamMagma:
ringSize = caps.magmaCapset.ringSize;
bufferSize = caps.magmaCapset.bufferSize;
blobAlignment = caps.magmaCapset.blobAlignment;
break;
case kCapsetGfxStreamGles:
ringSize = caps.glesCapset.ringSize;
bufferSize = caps.glesCapset.bufferSize;

View file

@ -216,10 +216,6 @@ int32_t DrmVirtGpuDevice::init(int32_t descriptor) {
get_caps.size = sizeof(struct vulkanCapset);
get_caps.addr = (unsigned long long)&mCaps.vulkanCapset;
break;
case kCapsetGfxStreamMagma:
get_caps.size = sizeof(struct magmaCapset);
get_caps.addr = (unsigned long long)&mCaps.magmaCapset;
break;
case kCapsetGfxStreamGles:
get_caps.size = sizeof(struct glesCapset);
get_caps.addr = (unsigned long long)&mCaps.glesCapset;

View file

@ -32,7 +32,7 @@ FuchsiaVirtGpuDevice::FuchsiaVirtGpuDevice(enum VirtGpuCapset capset, magma_devi
mCaps.params[kParamCreateGuestHandle] = 0;
if (capset == kCapsetGfxStreamVulkan) {
uint64_t query_id = kMagmaVirtioGpuQueryCapset;
uint64_t query_id = 0;
query_id |= static_cast<uint64_t>(kCapsetGfxStreamVulkan) << 32;
constexpr uint16_t kVersion = 0;
query_id |= static_cast<uint64_t>(kVersion) << 16;

View file

@ -45,7 +45,6 @@ enum VirtGpuCapset {
kCapsetVenus = 4,
kCapsetCrossDomain = 5,
kCapsetDrm = 6,
kCapsetGfxStreamMagma = 7,
kCapsetGfxStreamGles = 8,
kCapsetGfxStreamComposer = 9,
};

View file

@ -81,10 +81,6 @@ VirtGpuKumquatDevice::VirtGpuKumquatDevice(enum VirtGpuCapset capset, int32_t de
get_caps.size = sizeof(struct vulkanCapset);
get_caps.addr = (unsigned long long)&mCaps.vulkanCapset;
break;
case kCapsetGfxStreamMagma:
get_caps.size = sizeof(struct magmaCapset);
get_caps.addr = (unsigned long long)&mCaps.magmaCapset;
break;
case kCapsetGfxStreamGles:
get_caps.size = sizeof(struct glesCapset);
get_caps.addr = (unsigned long long)&mCaps.glesCapset;