fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gfxstream: look for common/opengl headers

Browse source 
Probably "Make GL header lib and update libs to explicitly
depend on it" broke the meson build.

In file included from ../renderControl_enc/renderControl_types.h:19,
                 from ../renderControl_enc/renderControl_client_proc.h:8,
                 from ../renderControl_enc/renderControl_client_context.h:6,
                 from ../renderControl_enc/renderControl_enc.h:9,
                 from ../vulkan_enc/../OpenglSystemCommon/HostConnection.h:25,
                 from ../vulkan_enc/ResourceTracker.cpp:19:
../OpenglCodecCommon/glUtils.h:46:10: fatal error: GLES/gl.h: No such file or directory

Long term, we should nuke renderControl and GL dependencies through
compile options (GOLDFISH_NO_GL) for example.

     ninja -C amd64-build

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:
Gurchetan Singh 2023-11-16 17:09:37 -08:00 • committed by Marge Bot
parent ff6d914b9b
commit 07d7882a80
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gfxstream/guest/vulkan/meson.build
View file

@ -12,9 +12,10 @@ lib_vulkan_cereal = shared_library(
'vulkan_cereal',
files_lib_vulkan_cereal,
cpp_args: cpp_args,
include_directories: [inc_vulkan_headers, inc_android_emu, inc_android_compat,
inc_opengl_system, inc_guest_iostream, inc_opengl_codec, inc_render_enc,
inc_vulkan_enc, inc_platform, inc_goldfish_address_space, inc_system],
include_directories: [inc_vulkan_headers, inc_opengl_headers, inc_android_emu,
inc_android_compat, inc_opengl_system, inc_guest_iostream,
inc_opengl_codec, inc_render_enc, inc_vulkan_enc, inc_platform,
inc_goldfish_address_space, inc_system],
link_with: [lib_android_compat, lib_emu_android_base, lib_stream,
lib_vulkan_enc],
install: true,

2
src/gfxstream/guest/vulkan_enc/meson.build
View file

@ -28,7 +28,7 @@ lib_vulkan_enc = static_library(
include_directories: [inc_android_emu, inc_guest_iostream, inc_android_compat,
inc_opengl_codec, inc_render_enc, inc_system,
inc_goldfish_address_space, inc_platform,
inc_vulkan_headers],
inc_vulkan_headers, inc_opengl_headers],
link_with: [lib_platform],
dependencies: dependency('libdrm'),
)