gfxstream: delete duplicate virtgpu_drm.h
We have three versions of virtgpu_drm.h In reality, we only need one. Update the version in guest/mesa and use that. clang-format went a little crazy here.. 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:

committed by
Marge Bot

parent
105923cd63
commit
0f29e172fd
@@ -22,9 +22,9 @@
|
||||
#include <cerrno>
|
||||
#include <cstring>
|
||||
|
||||
#include "util/log.h"
|
||||
#include "LinuxVirtGpu.h"
|
||||
#include "virtgpu_drm.h"
|
||||
#include "drm-uapi/virtgpu_drm.h"
|
||||
#include "util/log.h"
|
||||
|
||||
LinuxVirtGpuResource::LinuxVirtGpuResource(int64_t deviceHandle, uint32_t blobHandle,
|
||||
uint32_t resourceHandle, uint64_t size)
|
||||
|
@@ -17,6 +17,7 @@
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include "LinuxVirtGpu.h"
|
||||
#include "drm-uapi/virtgpu_drm.h"
|
||||
|
||||
LinuxVirtGpuResourceMapping::LinuxVirtGpuResourceMapping(VirtGpuResourcePtr blob, uint8_t* ptr,
|
||||
uint64_t size)
|
||||
|
@@ -27,8 +27,8 @@
|
||||
#include <string>
|
||||
|
||||
#include "LinuxVirtGpu.h"
|
||||
#include "drm-uapi/virtgpu_drm.h"
|
||||
#include "util/log.h"
|
||||
#include "virtgpu_drm.h"
|
||||
#include "virtgpu_gfxstream_protocol.h"
|
||||
|
||||
#define VIRTGPU_PARAM_CREATE_FENCE_PASSING 9 /* Fence passing */
|
||||
|
@@ -12,6 +12,7 @@ libplatform_virtgpu_linux = static_library(
|
||||
'platform_virtgpu_linux',
|
||||
files_libplatform_virtgpu_linux,
|
||||
cpp_args: gfxstream_guest_args,
|
||||
include_directories: [inc_platform_virtgpu, inc_src, inc_android_compat],
|
||||
include_directories: [inc_platform_virtgpu, inc_src, inc_include,
|
||||
inc_android_compat],
|
||||
dependencies: drm_dep,
|
||||
)
|
||||
|
Reference in New Issue
Block a user