OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[guest] Fix Fuchsia build

Browse Source 
Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
This commit is contained in:
C Stout
2024-07-22 19:22:38 -07:00
committed by Marge Bot
parent c27e611dd9
commit 90c80dc90a
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpu.h
View File

@@ -57,7 +57,8 @@ class FuchsiaVirtGpuDevice : public VirtGpuDevice {
VirtGpuResourcePtr createBlob(const struct VirtGpuCreateBlob& blobCreate) override;
VirtGpuResourcePtr createResource(uint32_t width, uint32_t height, uint32_t stride,
uint32_t format, uint32_t target, uint32_t bind) override;
uint32_t size, uint32_t virglFormat, uint32_t target,
uint32_t bind) override;
VirtGpuResourcePtr importBlob(const struct VirtGpuExternalHandle& handle) override;
int execBuffer(struct VirtGpuExecBuffer& execbuffer, const VirtGpuResource* blob) override;

5
src/gfxstream/guest/platform/fuchsia/FuchsiaVirtGpuDevice.cpp
View File

@@ -75,8 +75,9 @@ VirtGpuResourcePtr FuchsiaVirtGpuDevice::createBlob(const struct VirtGpuCreateBl
}
VirtGpuResourcePtr FuchsiaVirtGpuDevice::createResource(uint32_t width, uint32_t height,
uint32_t stride, uint32_t virglFormat,
uint32_t target, uint32_t bind) {
uint32_t stride, uint32_t size,
uint32_t virglFormat, uint32_t target,
uint32_t bind) {
ALOGE("%s: unimplemented", __func__);
return nullptr;
}

1
src/gfxstream/guest/vulkan/gfxstream_vk_fuchsia.cpp
View File

@@ -3,6 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <cutils/log.h>
#include <fidl/fuchsia.logger/cpp/wire.h>
#include <lib/syslog/structured_backend/cpp/fuchsia_syslog.h>
#include <lib/zx/channel.h>

6
src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
View File

@@ -2688,7 +2688,7 @@ VkResult ResourceTracker::on_vkSetBufferCollectionBufferConstraintsFUCHSIA(
VkResult ResourceTracker::getBufferCollectionImageCreateInfoIndexLocked(
VkBufferCollectionFUCHSIA collection, fuchsia_sysmem::wire::BufferCollectionInfo2& info,
uint32_t* outCreateInfoIndex) {
if (!info_VkBufferCollectionFUCHSIA[collection].constraints.hasValue()) {
if (!info_VkBufferCollectionFUCHSIA[collection].constraints.has_value()) {
mesa_loge("%s: constraints not set", __func__);
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
}
@@ -3496,7 +3496,7 @@ VkResult ResourceTracker::on_vkAllocateMemory(void* context, VkResult input_resu
fuchsia_sysmem::wire::BufferCollectionInfo2& info = result->buffer_collection_info;
uint32_t index = importBufferCollectionInfoPtr->index;
if (info.buffer_count < index) {
mesa_loge("Invalid buffer index: %d %d", index);
mesa_loge("Invalid buffer index: %d", index);
_RETURN_FAILURE_WITH_DEVICE_MEMORY_REPORT(VK_ERROR_INITIALIZATION_FAILED);
}
vmo_handle = info.buffers[index].vmo.release();
@@ -4053,7 +4053,7 @@ void ResourceTracker::on_vkFreeMemory(void* context, VkDevice device, VkDeviceMe
zx_status_t status = zx_vmar_unmap(
zx_vmar_root_self(), reinterpret_cast<zx_paddr_t>(info.ptr), info.allocationSize);
if (status != ZX_OK) {
mesa_loge("%s: Cannot unmap ptr: status %d", status);
mesa_loge("%s: Cannot unmap ptr: status %d", __func__, status);
}
info.ptr = nullptr;
}