virgl: move protocol headers to a common place
Tested with meson. Android.mk changes are not tested. Signed-off-by: Chia-I Wu <olvaffe@gmail.com> Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6235>
This commit is contained in:
parent
a4c708dd24
commit
42e29feb8b
|
@ -31,6 +31,9 @@ LOCAL_SRC_FILES := \
|
|||
LOCAL_MODULE := libmesa_pipe_virgl
|
||||
|
||||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||
|
||||
LOCAL_C_INCLUDES := $(MESA_TOP)/src/virtio
|
||||
|
||||
intermediates := $(call local-generated-sources-dir)
|
||||
LOCAL_GENERATED_SOURCES := $(intermediates)/virgl/virgl_driinfo.h
|
||||
|
||||
|
|
|
@ -4,8 +4,6 @@ C_SOURCES := \
|
|||
virgl_context.h \
|
||||
virgl_encode.c \
|
||||
virgl_encode.h \
|
||||
virgl_hw.h \
|
||||
virgl_protocol.h \
|
||||
virgl_public.h \
|
||||
virgl_query.c \
|
||||
virgl_resource.c \
|
||||
|
|
|
@ -47,7 +47,7 @@ libvirgl = static_library(
|
|||
'virgl',
|
||||
[ files_libvirgl, virgl_driinfo_h ],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio],
|
||||
dependencies : dep_libdrm
|
||||
)
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ test(
|
|||
'virgl_staging_mgr_test',
|
||||
files('virgl_staging_mgr_test.cpp'),
|
||||
dependencies : [dep_thread, idep_gtest],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, include_directories('..')],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_virtio, include_directories('..')],
|
||||
link_with : [libvirgl, libgallium],
|
||||
),
|
||||
suite : ['virgl'],
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
#include "virgl_encode.h"
|
||||
#include "virgl_context.h"
|
||||
#include "virgl_protocol.h"
|
||||
#include "virtio-gpu/virgl_protocol.h"
|
||||
#include "virgl_resource.h"
|
||||
#include "virgl_screen.h"
|
||||
#include "virgl_staging_mgr.h"
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include "virgl_context.h"
|
||||
#include "virgl_encode.h"
|
||||
#include "virgl_protocol.h"
|
||||
#include "virtio-gpu/virgl_protocol.h"
|
||||
#include "virgl_resource.h"
|
||||
#include "virgl_screen.h"
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#include "pipe/p_state.h"
|
||||
|
||||
#include "virgl_winsys.h"
|
||||
#include "virgl_protocol.h"
|
||||
#include "virtio-gpu/virgl_protocol.h"
|
||||
|
||||
struct tgsi_token;
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "util/u_inlines.h"
|
||||
#include "virgl_context.h"
|
||||
#include "virgl_encode.h"
|
||||
#include "virgl_protocol.h"
|
||||
#include "virtio-gpu/virgl_protocol.h"
|
||||
#include "virgl_resource.h"
|
||||
#include "virgl_screen.h"
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "util/list.h"
|
||||
#include "util/u_transfer.h"
|
||||
|
||||
#include "virgl_hw.h"
|
||||
#include "virtio-gpu/virgl_hw.h"
|
||||
#include "virgl_screen.h"
|
||||
#define VR_MAX_TEXTURE_2D_LEVELS 15
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include "virgl_resource.h"
|
||||
#include "virgl_public.h"
|
||||
#include "virgl_context.h"
|
||||
#include "virgl_protocol.h"
|
||||
#include "virtio-gpu/virgl_protocol.h"
|
||||
|
||||
int virgl_debug = 0;
|
||||
static const struct debug_named_value debug_options[] = {
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "util/u_memory.h"
|
||||
#include "virgl_context.h"
|
||||
#include "virgl_encode.h"
|
||||
#include "virgl_protocol.h"
|
||||
#include "virtio-gpu/virgl_protocol.h"
|
||||
#include "virgl_resource.h"
|
||||
|
||||
static struct pipe_stream_output_target *virgl_create_so_target(
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "util/u_box.h"
|
||||
#include "util/u_inlines.h"
|
||||
|
||||
#include "virgl_protocol.h"
|
||||
#include "virtio-gpu/virgl_protocol.h"
|
||||
#include "virgl_context.h"
|
||||
#include "virgl_screen.h"
|
||||
#include "virgl_encode.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#define VIRGL_WINSYS_H
|
||||
|
||||
#include "pipe/p_defines.h"
|
||||
#include "virgl_hw.h"
|
||||
#include "virtio-gpu/virgl_hw.h"
|
||||
|
||||
struct pipe_box;
|
||||
struct pipe_fence_handle;
|
||||
|
|
|
@ -29,6 +29,8 @@ LOCAL_SRC_FILES := $(C_SOURCES)
|
|||
|
||||
LOCAL_MODULE := libmesa_winsys_virgl
|
||||
|
||||
LOCAL_C_INCLUDES := $(MESA_TOP)/src/virtio
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common
|
||||
|
||||
include $(GALLIUM_COMMON_MK)
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
libvirgldrm = static_library(
|
||||
'virgldrm',
|
||||
'virgl_drm_winsys.c',
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio],
|
||||
dependencies : [dep_libdrm, dep_libvirglcommon],
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
)
|
||||
|
|
|
@ -29,6 +29,8 @@ LOCAL_SRC_FILES := $(C_SOURCES)
|
|||
|
||||
LOCAL_MODULE := libmesa_winsys_virgl_vtest
|
||||
|
||||
LOCAL_C_INCLUDES := $(MESA_TOP)/src/virtio
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common
|
||||
|
||||
include $(GALLIUM_COMMON_MK)
|
||||
|
|
|
@ -2,5 +2,4 @@ C_SOURCES := \
|
|||
virgl_vtest_public.h \
|
||||
virgl_vtest_socket.c \
|
||||
virgl_vtest_winsys.c \
|
||||
virgl_vtest_winsys.h \
|
||||
vtest_protocol.h
|
||||
virgl_vtest_winsys.h
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
libvirglvtest = static_library(
|
||||
'virglvtest',
|
||||
['virgl_vtest_socket.c', 'virgl_vtest_winsys.c'],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers],
|
||||
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_virtio],
|
||||
dependencies : dep_libvirglcommon,
|
||||
gnu_symbol_visibility : 'hidden',
|
||||
)
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "os/os_thread.h"
|
||||
|
||||
#include "virgl/virgl_winsys.h"
|
||||
#include "vtest_protocol.h"
|
||||
#include "vtest/vtest_protocol.h"
|
||||
#include "virgl_resource_cache.h"
|
||||
|
||||
struct pipe_fence_handle;
|
||||
|
|
|
@ -85,6 +85,9 @@ endif
|
|||
if with_gallium_panfrost or with_gallium_lima
|
||||
subdir('panfrost')
|
||||
endif
|
||||
if with_gallium_virgl
|
||||
subdir('virtio')
|
||||
endif
|
||||
if with_dri_i965 or with_intel_vk or with_gallium_iris
|
||||
subdir('intel')
|
||||
endif
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
# Copyright © 2017 Intel Corporation
|
||||
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
|
||||
# The above copyright notice and this permission notice shall be included in
|
||||
# all copies or substantial portions of the Software.
|
||||
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
inc_virtio = include_directories('.')
|
Loading…
Reference in New Issue